[evolution] Updated Korean translation



commit 8abf9de5babcfd7e4d3fd30d972e5c2bc13eeee3
Author: Changwoo Ryu <cwryu debian org>
Date:   Mon Sep 10 03:08:42 2012 +0900

    Updated Korean translation

 po/ko.po |14044 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 6394 insertions(+), 7650 deletions(-)
---
diff --git a/po/ko.po b/po/ko.po
index 4e6ef92..4855ad8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,6 +11,7 @@
 # - êí íëêë ìì ëìê êì ìì:
 #   - Bogofilter -> ëêíí
 #   - SpamAssassin -> ìíììì
+#   - Pidgin -> íì
 # - "ìëê wrote:", "---Original Message---", "---Forwarded Message---"
 #   ììë ëìì ëë ìëëì ììíë ëììì ëìì ììì
 #   UIëì ëìê ìëëë ìêí ë ììë. íìë ëìëì ììêë
@@ -39,13 +40,14 @@
 #   - day view -> ìë ëê
 #   - work week view -> êëì ìë ëê
 #   - date navigator -> ëì ìí ëë
-#: ../shell/main.c:570
+#: ../shell/main.c:555
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N&component=Miscellaneous\n";
-"POT-Creation-Date: 2012-03-10 17:27+0900\n"
-"PO-Revision-Date: 2012-03-10 20:26+0900\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
+"POT-Creation-Date: 2012-08-24 22:06+0000\n"
+"PO-Revision-Date: 2012-09-10 03:08+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu debian org>\n"
 "Language-Team: GNOME Korea <gnome-kr googlegroups com>\n"
 "Language: Korean\n"
@@ -118,41 +120,56 @@ msgid "This address book will be removed permanently."
 msgstr "ììëì ììí ìêíëë."
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
 msgid "Do _Not Delete"
 msgstr "ììíì ìê(_N)"
 
 #: ../addressbook/addressbook.error.xml.h:14
+msgid "Delete remote address book &quot;{0}&quot;?"
+msgstr "&quot;{0}&quot; ìê ììëì ììíìêìëê?"
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid ""
+"This will permanently remove the address book &quot;{0}&quot; from the "
+"server. Are you sure you want to proceed?"
+msgstr "ìëê íë ìëìì &quot;{0}&quot; ììëì ììí ìêíëë. ìëë êì íìêìëê?"
+
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:68
+msgid "_Delete From Server"
+msgstr "ìëìì ìì(_D)"
+
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Category editor not available."
 msgstr "ëë íìêë ììí ì ììëë."
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Unable to open address book"
 msgstr "ììëì ì ì ììëë"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
 msgstr "êìì ìíí ì ììëë."
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Would you like to save your changes?"
 msgstr "ëë ëëì ììíìêìëê?"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "ì ìëìì ëë ëëì ììëë. ëë ìíì ììíìêìëê?"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "_Discard"
 msgstr "ëëê(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Cannot move contact."
 msgstr "ìëìë ìê ì ììëë."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:24
 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?"
@@ -160,47 +177,47 @@ msgstr ""
 "ìëìë í ììëìì ëë ììëìë ìêëê íìë ìë ììëìì ìëì"
 "ë ìì ì ììëë. ìêë ëìì ëìíìêìëê?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "ìíí êë íêê íëë. íêë ììíì ììíìêìëê?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "_Resize"
 msgstr "íê ìì(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Use as it is"
 msgstr "êëë ìì(_U)"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Do not save"
 msgstr "ììíì ìê(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "{0}ì(ë) ììí ì ììëë."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0}ì(ë) {1}ì ììíëë ìëê ëìíìëë: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "ìëëì ììëì ììì ëíê ëëìëë."
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "ìëëìì ëì ììí ë êìë {0}ì ëí ìëìë ììí ì ììëë."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Address '{0}' already exists."
 msgstr "'{0}' ììê ìë ììëë."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -208,16 +225,16 @@ msgstr ""
 "ì ììê ëì ìë ìëìê ìë ììëë. êëë êì ììì ìëë ìë ë"
 "ëìêìëê?"
 
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../mail/em-vfolder-editor-rule.c:339 ../widgets/table/e-table-config.ui.h:6
+#: ../addressbook/addressbook.error.xml.h:36
+#: ../mail/em-vfolder-editor-rule.c:391 ../widgets/table/e-table-config.ui.h:6
 msgid "_Add"
 msgstr "ìê(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Some addresses already exist in this contact list."
 msgstr "ìëì ëëì ìë ëì ìë ììê ììëë."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:38
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -225,19 +242,19 @@ msgstr ""
 "ìêíëë ìëì ìì ìë ëëì ìë ìëìê ììëë. êëë ìêíìê"
 "ìëê?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "Skip duplicates"
 msgstr "ìë ëì"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "Add with duplicates"
 msgstr "ìëë ìê"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "List '{0}' is already in this contact list."
 msgstr "'{0}' ëëì ìë ìëì ëëì ëì ììëë."
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
@@ -245,49 +262,21 @@ msgstr ""
 "ìëì '{0}'ì ìëì ëëì ìë ì ìëì ëëì ëì ììëë. êëë ìê"
 "íìêìëê?"
 
-#: ../addressbook/addressbook.error.xml.h:40
-msgid "Some features may not work properly with your current server"
-msgstr "ì ìëììë ìë êëì ìëë ëìíì ìì ìë ììëë"
-
-#: ../addressbook/addressbook.error.xml.h:41
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"ììíì ìë êëììì ìëì ìêëì ìê ëëì ìëëìì ììíëì ë"
-"ìê ëìí ìë ììëë. ìëë ììíë ëììë ìêëìëíë ê êì ì"
-"ìëë."
-
-#: ../addressbook/addressbook.error.xml.h:42
-msgid "GroupWise Address book creation:"
-msgstr "êëììì ììë ëëê:"
-
 #: ../addressbook/addressbook.error.xml.h:43
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"íì ìëëìììë êëììì ììí ììëë ìêí ì ììëë. ìë ëë "
-"êëììì ëì íëììíë ììíì êëììì ìì ìë ìëì ë êëìì"
-"ì êì ìëì íëë êììììì."
-
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1258
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
 msgid "Failed to delete contact"
 msgstr "ìëìë ììíëë ìííìëë"
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ì ììëì ìëìë ìì êíì ììëë."
 
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "Cannot add new contact"
 msgstr "ìëì ìëìë ìêí ì ììëë"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:48
+#: ../addressbook/addressbook.error.xml.h:47
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -296,9 +285,9 @@ msgstr ""
 "ì ëêìì ëë ììëì ìííììì."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:628
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:625
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:647
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2935
 msgid "Contact Editor"
 msgstr "ìëì íìê"
 
@@ -335,12 +324,11 @@ msgid "_Wants to receive HTML mail"
 msgstr "HTML ëì ëì(_W)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:392
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../addressbook/gui/merging/eab-contact-merging.c:396
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:973
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../smime/lib/e-cert.c:811
+#: ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "ììëì"
 
@@ -353,7 +341,7 @@ msgid "Instant Messaging"
 msgstr "ììíì ëìì"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:990
+#: ../addressbook/importers/evolution-vcard-importer.c:1002
 msgid "Contact"
 msgstr "ìëì"
 
@@ -362,9 +350,9 @@ msgid "_Home Page:"
 msgstr "ííìì(_H):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../plugins/itip-formatter/itip-view.c:1980
+#: ../modules/itip-formatter/itip-view.c:1842
 msgid "_Calendar:"
 msgstr "ëë(_C):"
 
@@ -382,6 +370,7 @@ msgid "Home Page:"
 msgstr "ííìì:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../modules/cal-config-google/evolution-cal-config-google.c:98
 msgid "Calendar:"
 msgstr "ëë:"
 
@@ -457,8 +446,8 @@ msgid "_Anniversary:"
 msgstr "êëì(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-display.c:729
-#: ../calendar/gui/e-calendar-view.c:2131
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
+#: ../calendar/gui/e-calendar-view.c:2150
 msgid "Anniversary"
 msgstr "êëì"
 
@@ -468,9 +457,8 @@ 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:38
-#: ../addressbook/gui/widgets/eab-contact-display.c:728
-#: ../calendar/gui/e-calendar-view.c:2130 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
+#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:129
 msgid "Birthday"
 msgstr "ìì"
 
@@ -508,27 +496,27 @@ msgid "_Address:"
 msgstr "ìì(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
-#: ../addressbook/gui/widgets/eab-contact-display.c:82
-#: ../addressbook/gui/widgets/eab-contact-display.c:1360
-#: ../widgets/misc/e-contact-map.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/widgets/eab-contact-display.c:399
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:75
+#: ../widgets/misc/e-contact-map.c:298
 msgid "Home"
 msgstr "ì"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:81
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
-#: ../addressbook/gui/widgets/eab-contact-display.c:1357
-#: ../widgets/misc/e-contact-map.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-display.c:396
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:74
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
+#: ../widgets/misc/e-contact-map.c:306
 msgid "Work"
 msgstr "ìë"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:83
-#: ../addressbook/gui/widgets/eab-contact-display.c:421
-#: ../calendar/gui/e-cal-model.c:3471
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:76
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:384
+#: ../calendar/gui/e-cal-model.c:3570
 msgid "Other"
 msgstr "êí"
 
@@ -540,74 +528,79 @@ msgstr "ëìë ìì"
 msgid "Notes"
 msgstr "ìì"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:669
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:672
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
 msgid "Jabber"
 msgstr "ìë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:674
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
 msgid "Yahoo"
 msgstr "ìí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:675
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
 msgid "Gadu-Gadu"
 msgstr "êëêë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:673
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:671
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
 msgid "GroupWise"
 msgstr "êëììì"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
 msgid "Skype"
 msgstr "ìììí"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:488
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
+msgid "Twitter"
+msgstr "íìí"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:497
 msgid "Error adding contact"
 msgstr "ìëìë ìêíë ì ìëê ëìíìëë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:232
 msgid "Error modifying contact"
 msgstr "ìëìë ììíë ì ìëê ëìíìëë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Error removing contact"
 msgstr "ìëìë ìêíë ì ìëê ëìíìëë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:644
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2905
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:641
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2929
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ìëì íì - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3386
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
 msgid "Please select an image for this contact"
 msgstr "ì ìëìì ììí êëì ìííììì"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3387
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
 msgid "_No image"
 msgstr "êë ìì(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -615,28 +608,28 @@ msgstr ""
 "ìëì ëìíê ìëëììëë:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3720
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'ì ìëë íìì ëì ììëë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' íìì ëëê ëë ì ëëë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3766
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'ì ìëë íìì ëì ììëë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3748
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3762
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3779
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3793
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s'ì(ê) ëì ììëë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3777
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
 msgid "Invalid contact."
 msgstr "ìëìê ìëëììëë."
 
@@ -648,15 +641,15 @@ msgstr "ìëì ëë ìê"
 msgid "_Edit Full"
 msgstr "ìì ìë íì(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:492
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
 msgid "_Full name"
 msgstr "ìì ìë(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:503
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:502
 msgid "E_mail"
 msgstr "ìì ëì(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:514
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
 msgid "_Select Address Book"
 msgstr "ììë ìí(_S)"
 
@@ -727,7 +720,7 @@ msgid "_Suffix:"
 msgstr "íì(_S):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:768
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
 msgid "Contact List Editor"
 msgstr "ìëì ëë íìê"
 
@@ -748,27 +741,39 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "ì ëëìë ëì ëë ë ìì ìêê(_H)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-#: ../mail/mail-config.ui.h:156
+msgid "Add an email to the List"
+msgstr "ììëìì ëëì ìê"
+
+# tooltip
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+msgid "Remove an email address from the List"
+msgstr "ììëì ììë ëëìì ìêíëë"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+msgid "Insert email addresses from Address Book"
+msgstr "ììëìì ììëì ìì ëê"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 msgid "_Select..."
 msgstr "ìí(_S)..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:891
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:887
 msgid "Contact List Members"
 msgstr "ìëì ëë êìì"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1409
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1412
 msgid "_Members"
 msgstr "êìì(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1523
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
 msgid "Error adding list"
 msgstr "ëëì ìêíë ì ìëê ëìíìëë"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1538
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
 msgid "Error modifying list"
 msgstr "ëëì ììíë ì ìëê ëìíìëë"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1553
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1561
 msgid "Error removing list"
 msgstr "ëëì ìêíë ì ìëê ëìíìëë"
 
@@ -795,7 +800,7 @@ msgid "Changed Contact:"
 msgstr "ëë ìëì:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:338
+#: ../addressbook/gui/merging/eab-contact-merging.c:342
 msgid "_Merge"
 msgstr "íìê(_M)"
 
@@ -815,201 +820,185 @@ msgstr "ìë ìëì:"
 msgid "New Contact:"
 msgstr "ì ìëì:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:320
+#: ../addressbook/gui/merging/eab-contact-merging.c:324
 msgid "Merge Contact"
 msgstr "ìëì íìê"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "Name contains"
 msgstr "ìëì íí"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1070
+#: ../modules/addressbook/e-book-shell-view-actions.c:1065
 msgid "Email begins with"
 msgstr "ëì ìì ìì"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1063
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/calendar/e-cal-shell-view-actions.c:1798
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1012
 msgid "Any field contains"
 msgstr "íëì íí"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:93
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:102
 #: ../addressbook/gui/widgets/ea-minicard-view.c:189
 msgid "evolution address book"
 msgstr "ìëëì ììë"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:162
 msgid "Copy _Email Address"
 msgstr "ììëì ìì ëì(_E)"
 
 # tooltip
-#: ../addressbook/gui/widgets/eab-contact-display.c:193
-#: ../widgets/misc/e-web-view.c:432
+#: ../addressbook/gui/widgets/eab-contact-display.c:164
+#: ../widgets/misc/e-web-view.c:296 ../widgets/misc/e-web-view-gtkhtml.c:429
 msgid "Copy the email address to the clipboard"
 msgstr "ììëì ììë íëëëë ëìíëë"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
-#: ../widgets/misc/e-web-view.c:437
+#: ../addressbook/gui/widgets/eab-contact-display.c:169
+#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:434
 msgid "_Send New Message To..."
 msgstr "ì ëìì ëëê(_S)..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:200
-#: ../widgets/misc/e-web-view.c:439
+#: ../addressbook/gui/widgets/eab-contact-display.c:171
+#: ../widgets/misc/e-web-view.c:303 ../widgets/misc/e-web-view-gtkhtml.c:436
 msgid "Send a mail message to this address"
 msgstr "ììëì ëììë ì ììë ëëëë"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:227
+#: ../addressbook/gui/widgets/eab-contact-display.c:333
+#: ../widgets/misc/e-web-view.c:1102 ../widgets/misc/e-web-view-gtkhtml.c:973
+#, c-format
+msgid "Click to mail %s"
+msgstr "ëìì %s ììë ëëëë ëëììì"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:154
 msgid "Open map"
 msgstr "ìë ìê"
 
 # Listë ìêì Mailing Listë ëíë
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:549
 msgid "List Members:"
 msgstr "ëìí êìì:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "ëë"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "íì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:695
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
 msgid "Department"
 msgstr "ëì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
 msgid "Profession"
 msgstr "ìë"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:697
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
 msgid "Position"
 msgstr "ìì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:698
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "êëì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "ëì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
 msgid "Video Chat"
 msgstr "íì ëí"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:701
-#: ../calendar/gui/dialogs/calendar-setup.c:469
-#: ../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:528
-#: ../modules/online-accounts/e-online-accounts-google.c:302
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../modules/calendar/e-cal-shell-view-actions.c:217
+#: ../modules/calendar/e-cal-shell-view-actions.c:246
+#: ../modules/calendar/e-cal-shell-view.c:548
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:546
 msgid "Calendar"
 msgstr "ëë"
 
 # free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
-#: ../addressbook/gui/widgets/eab-contact-display.c:702
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
 #: ../calendar/gui/dialogs/event-editor.c:127
 #: ../calendar/gui/dialogs/event-editor.c:354
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "ìì ìì/ìì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:703
-#: ../addressbook/gui/widgets/eab-contact-display.c:725
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
 msgid "Phone"
 msgstr "ìí"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
 msgid "Fax"
 msgstr "íì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:705
-#: ../addressbook/gui/widgets/eab-contact-display.c:727
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
 msgid "Address"
 msgstr "ìì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
 msgid "Home Page"
 msgstr "ííìì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:723
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
 msgid "Web Log"
 msgstr "ìëê"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:726
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "íë ìí"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:730
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "ëìì"
 
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person memo list
-#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:732
-#: ../capplet/settings/mail-capplet-shell.c:385
-#: ../modules/addressbook/e-book-shell-backend.c:126
-#: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:144
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:132
-#: ../modules/calendar/e-memo-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-backend.c:128
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
 msgid "Personal"
 msgstr "êì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "ëë"
 
 # Listë ìêì Mailing Listë ëíë
-#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:937
 msgid "List Members"
 msgstr "ëìí êìì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1040
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:958
 msgid "Job Title"
 msgstr "ìì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:999
 msgid "Home page"
 msgstr "ííìì"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1086
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1009
 msgid "Blog"
 msgstr "ëëê"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1285
-#: ../widgets/misc/e-web-view.c:980
-#, c-format
-msgid "Click to mail %s"
-msgstr "ëìì %s ììë ëëëë ëëììì"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 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 "
@@ -1020,7 +1009,7 @@ msgstr ""
 "ìëë. ìê ìí ëëìì ììëì ëì ììëìì ê ëìì ëìëëíìì"
 "ì."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1029,7 +1018,7 @@ msgstr ""
 "ì ììëì ì ì ììëë.  íë êëê (%s) ìê ê êëì ìêí êíì ì"
 "ëì íìíììì."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:156
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1037,7 +1026,7 @@ msgstr ""
 "ì ìëëì ëììë LDAP ìì êëì ìíìíì ìììëë.  LDAPì ììíë"
 "ë LDAPì ììíë ìëëìì ììíì íëë."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1045,11 +1034,11 @@ msgstr ""
 "ì ììëì ì ì ììëë.  ìëë URIë ìëíêë, íë ìëì ìêí ì "
 "ììëë."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "Detailed error message:"
 msgstr "ììí ìë ëìì:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:216
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1061,7 +1050,7 @@ msgstr ""
 "ì ë êìììë ìêë ììëì ëëíë ìë êë ìììì \n"
 "êêì íêìë ììíììì."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 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"
@@ -1073,70 +1062,70 @@ msgstr ""
 "ìê ìíì ëë ëììì."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#: ../addressbook/gui/widgets/eab-gui-util.c:225
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "ì ììëì ëìëìì ì ììë íìí ì ììëë. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:236
+#: ../addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "ì ììëì ëìëìì ì ììë ìííê êëíìëë. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:236
 #: ../addressbook/gui/widgets/eab-gui-util.c:242
-#: ../addressbook/gui/widgets/eab-gui-util.c:248
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "ì ììê ìêììë ëëì ìììëë. %s"
 
 # íì ìë
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:270
+#: ../addressbook/gui/widgets/eab-gui-util.c:264
 msgid "card.vcf"
 msgstr "ìë.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Select Address Book"
 msgstr "ììë ìí"
 
 # íì ìë
-#: ../addressbook/gui/widgets/eab-gui-util.c:390
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "list"
 msgstr "ëë"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:586
 msgid "Move contact to"
 msgstr "ìëì ìë"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:577
+#: ../addressbook/gui/widgets/eab-gui-util.c:588
 msgid "Copy contact to"
 msgstr "ìëì ëì"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:580
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
 msgid "Move contacts to"
 msgstr "ìëì ìë"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:582
+#: ../addressbook/gui/widgets/eab-gui-util.c:593
 msgid "Copy contacts to"
 msgstr "ìëì ëì"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:164
 msgid "No contacts"
 msgstr "ìëì ìì"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:168
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "ìëì %dê"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:363
+#: ../addressbook/gui/widgets/e-addressbook-model.c:371
 msgid "Error getting book view"
 msgstr "ììë ëêë êììëë ìëê ëìíìëë"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:752
+#: ../addressbook/gui/widgets/e-addressbook-model.c:805
 msgid "Search Interrupted"
 msgstr "êì ìë"
 
@@ -1144,56 +1133,56 @@ msgstr "êì ìë"
 msgid "Error modifying card"
 msgstr "ìëë ììíëë ìëê ëìíìëë"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
 msgid "Cut selected contacts to the clipboard"
 msgstr "ìíí ìëìë íëëëë ìëëëë"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Copy selected contacts to the clipboard"
 msgstr "ìíí ìëìë íëëëë ëìíëë"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+#: ../addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Paste contacts from the clipboard"
 msgstr "íëëëìì ìëìë ëì ëìëë"
 
 # tooltip
-#: ../addressbook/gui/widgets/e-addressbook-view.c:658
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../addressbook/gui/widgets/e-addressbook-view.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
 msgid "Delete selected contacts"
 msgstr "ìíí ìëìë ììíëë"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:664
+#: ../addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Select all visible contacts"
 msgstr "ëìë ëë ìëì ìí"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "ìëë ì ìëì ëëì ììíìêìëê?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact list?"
 msgstr "ìëë ì ìëì ëëì ììíìêìëê?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "ìëë ìëì ëëì (%s) ììíìêìëê?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 msgid "Are you sure you want to delete these contacts?"
 msgstr "ìëë ì ìëìë ììíìêìëê?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1324
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 msgid "Are you sure you want to delete this contact?"
 msgstr "ìëë ì êìì ììíìêìëê?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "ìëë ìëìë (%s) ììíìêìëê?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1490
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1205,11 +1194,11 @@ msgstr[0] ""
 "ìëì %dêë ìë %dêì ìì ìë ìê ëëë.\n"
 "ìëë ì ìëìë ëë ììêìëê?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1492
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
 msgid "_Don't Display"
 msgstr "íìíì ìê(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1493
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1499
 msgid "Display _All Contacts"
 msgstr "ëë ìëì íì(_A)"
 
@@ -1325,7 +1314,7 @@ msgid "Title"
 msgstr "ìì"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:653
+#: ../calendar/gui/e-meeting-list-view.c:657
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "ìí"
@@ -1377,20 +1366,20 @@ msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "íì ììë íë %sì ìë %dêê ëì ììëë"
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:93
 msgid "Work Email"
 msgstr "ìë ììëì"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:94
 msgid "Home Email"
 msgstr "ì ììëì"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:795
+#: ../addressbook/gui/widgets/e-minicard.c:95
+#: ../addressbook/gui/widgets/e-minicard.c:775
 msgid "Other Email"
 msgstr "êí ììëì"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1400,7 +1389,7 @@ msgstr ""
 "\n"
 "ìëìë ìë ììëë..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1414,7 +1403,7 @@ msgstr ""
 "\n"
 "ì ìëìë ëëëë ëììë ëë ëëììì."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:199
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1428,7 +1417,7 @@ msgstr ""
 "\n"
 "ì ìëìë ëëëë ëììë ëë ëëììì."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1438,7 +1427,7 @@ msgstr ""
 "\n"
 "ìëì êì."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:205
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1452,154 +1441,137 @@ msgstr ""
 msgid "Card View"
 msgstr "ìë: "
 
-#: ../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:415
-#: ../calendar/importers/icalendar-importer.c:905
-#: ../calendar/importers/icalendar-importer.c:944 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-csv-importer.c:746
+#: ../addressbook/importers/evolution-ldif-importer.c:544
+#: ../addressbook/importers/evolution-vcard-importer.c:279
+#: ../calendar/importers/icalendar-importer.c:446
+#: ../calendar/importers/icalendar-importer.c:939
+#: ../calendar/importers/icalendar-importer.c:978 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "êììë ì..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1075
+#: ../addressbook/importers/evolution-csv-importer.c:1084
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "ììë ìëì CSV íì TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1076
+#: ../addressbook/importers/evolution-csv-importer.c:1085
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "ììë ìëì CSV ë TAB êììê"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1084
+#: ../addressbook/importers/evolution-csv-importer.c:1093
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "ëìë ìëì CSV íì TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1085
+#: ../addressbook/importers/evolution-csv-importer.c:1094
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "ëìë ìëì CSV ë TAB êììê"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1093
+#: ../addressbook/importers/evolution-csv-importer.c:1102
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "ìëëì ìëì CSV íì TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1094
+#: ../addressbook/importers/evolution-csv-importer.c:1103
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "ìëëì ìëì CSV ë TAB êììê"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:796
+#: ../addressbook/importers/evolution-ldif-importer.c:805
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ëìí êí íì (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:797
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "Evolution LDIF importer"
 msgstr "ìëëì LDIF êììê"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:657
+#: ../addressbook/importers/evolution-vcard-importer.c:667
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:668
 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:723
+#: ../addressbook/printing/e-contact-print.c:717
 #, c-format
 msgid "Page %d"
 msgstr "íìì %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Specify the output file instead of standard output"
 msgstr "íì ìë ëìì ìëí íìì ììíëë"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "OUTPUTFILE"
 msgstr "<ìëíì>"
 
 # command line help
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "List local address book folders"
 msgstr "ëì ììë íë ëëì íìíëë"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "Show cards as vcard or csv file"
 msgstr "ìëë vcard íì csv íìë íìíëë"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../addressbook/tools/evolution-addressbook-export.c:69
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:71
+#: ../addressbook/tools/evolution-addressbook-export.c:72
 msgid "Export in asynchronous mode"
 msgstr "ëëê ëëë ëëëëë"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:74
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "ëëê ëëìì ìë íì í êì ëìê ìë êì, êë íê 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:76
+#: ../addressbook/tools/evolution-addressbook-export.c:77
 msgid "NUMBER"
 msgstr "<êì>"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:139
+#: ../addressbook/tools/evolution-addressbook-export.c:149
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "ëëí ììì ìëê ëìíìëë. --help ììì ììí ììëì íìíìì"
 "ì."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Only support csv or vcard format."
 msgstr "csv íì vcard íìëì ììíëë."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:162
+#: ../addressbook/tools/evolution-addressbook-export.c:172
 msgid "In async mode, output must be file."
 msgstr "ëëê ëëììë, íìë ìëíì íëë."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:170
+#: ../addressbook/tools/evolution-addressbook-export.c:180
 msgid "In normal mode, there is no need for the size option."
 msgstr "ìë ëëììë, íê ììì íì ììëë."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:201
+#: ../addressbook/tools/evolution-addressbook-export.c:213
 msgid "Unhandled error"
 msgstr "ìëíì ëí ìë"
 
-#: ../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
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:688
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
 msgid "Can not open file"
 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/memo-page.c:951 ../em-format/em-format.c:2330
-#: ../libemail-engine/mail-ops.c:640 ../mail/em-folder-tree.c:678
-#: ../plugins/caldav/caldav-browse-server.c:221
-#: ../plugins/caldav/caldav-browse-server.c:1478 ../plugins/face/face.c:174
-#: ../plugins/itip-formatter/itip-formatter.c:1485
-#: ../plugins/itip-formatter/itip-formatter.c:1855
-#: ../smime/gui/certificate-manager.c:317
-msgid "Unknown error"
-msgstr "ì ì ìë ìëê ëìíìëë"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:74
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "'%s' íëììíë ìëë ìííìëë: %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:109
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ë"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:121
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ìê"
@@ -1607,13 +1579,13 @@ msgstr[0] "ìê"
 #. 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/alarm-notify/alarm-notify-dialog.c:135
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:134
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ì"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:330
 msgid "Start time"
 msgstr "ìì ìê"
 
@@ -1622,90 +1594,91 @@ msgid "Appointments"
 msgstr "ìì"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "ëë íì(_A)"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
 msgid "_Snooze"
 msgstr "ìê ëë(_S)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../libevolution-utils/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "íì(_D)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1765
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
+#: ../modules/itip-formatter/itip-view.c:1460
+#: ../modules/itip-formatter/itip-view.c:1569
+msgid "Location:"
+msgstr "ìì:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "location of appointment"
+msgstr "ìì ìì"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
 msgid "Snooze _time:"
 msgstr "ìêí ìê(_T):"
 
 # FIXME - hard to translate UI + string based on English grammar
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:390
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:353
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../widgets/misc/e-interval-chooser.c:143
 msgid "days"
 msgstr "ì"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:7
-#: ../plugins/google-account-setup/google-contacts-source.c:388
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
+#: ../widgets/misc/e-interval-chooser.c:141
 msgid "hours"
 msgstr "ìê"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:6 ../modules/addressbook/ldap-config.ui.h:29
-#: ../plugins/google-account-setup/google-contacts-source.c:386
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../mail/e-mail-config-provider-page.c:527
+#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "ë"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
-msgid "location of appointment"
-msgstr "ìì ìì"
-
-#. Location
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/alarm-notify/alarm-queue.c:1758
-#: ../calendar/alarm-notify/alarm-queue.c:1768
-#: ../plugins/itip-formatter/itip-view.c:1051
-msgid "Location:"
-msgstr "ìì:"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-msgid "Dismiss _All"
-msgstr "ëë íì(_A)"
-
-#: ../calendar/alarm-notify/alarm-queue.c:1607
-#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1604
+#: ../calendar/alarm-notify/alarm-queue.c:1736
 msgid "No summary available."
 msgstr "ììì ììëë."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1616
-#: ../calendar/alarm-notify/alarm-queue.c:1618
+#: ../calendar/alarm-notify/alarm-queue.c:1613
+#: ../calendar/alarm-notify/alarm-queue.c:1615
 msgid "No description available."
 msgstr "ìëì ììëë."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1626
+#: ../calendar/alarm-notify/alarm-queue.c:1623
 msgid "No location information available."
 msgstr "ìì ìëê ììëë."
 
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../calendar/alarm-notify/alarm-queue.c:1672
+#: ../calendar/alarm-notify/alarm-queue.c:1669
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "ëë ìëì %dê ììëë"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1872
-#: ../calendar/alarm-notify/alarm-queue.c:1907
+#: ../calendar/alarm-notify/alarm-queue.c:1865
+#: ../calendar/alarm-notify/alarm-queue.c:1900
 msgid "Warning"
 msgstr "êê"
 
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../calendar/alarm-notify/alarm-queue.c:1876
+#: ../calendar/alarm-notify/alarm-queue.c:1869
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1718,7 +1691,7 @@ msgstr ""
 "ëëë ëì ìëìì ëë ìë ëí ììë íìíëë."
 
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../calendar/alarm-notify/alarm-queue.c:1913
+#: ../calendar/alarm-notify/alarm-queue.c:1906
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1735,25 +1708,25 @@ msgstr ""
 "\n"
 "ìëë ì íëêëì ìííìêìëê?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1928
+#: ../calendar/alarm-notify/alarm-queue.c:1921
 msgid "Do not ask me about this program again."
 msgstr "ì ëììë ëì ëì ììëë."
 
-#: ../calendar/alarm-notify/util.c:45
+#: ../calendar/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "ìëë ìê"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:371
-#: ../calendar/gui/misc.c:116
+#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:96
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%dìê"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:377
-#: ../calendar/gui/misc.c:122
+#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
+#: ../calendar/gui/misc.c:102
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1762,8 +1735,8 @@ msgstr[0] "%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/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:383
-#: ../calendar/gui/misc.c:126
+#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/gui/misc.c:106
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1989,6 +1962,7 @@ msgstr ""
 "ëëê ëëë."
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
+#: ../modules/itip-formatter/itip-view.c:3078
 msgid "_Save"
 msgstr "ìì(_S)"
 
@@ -2073,10 +2047,40 @@ msgid "This memo list will be removed permanently."
 msgstr "ì ëë ëëì ììí ìêíëë."
 
 #: ../calendar/calendar.error.xml.h:66
+msgid "Delete remote calendar &quot;{0}&quot;?"
+msgstr "&quot;{0}&quot; ìê ëëì ììíìêìëê?"
+
+#: ../calendar/calendar.error.xml.h:67
+msgid ""
+"This will permanently remove the calendar &quot;{0}&quot; from the server. "
+"Are you sure you want to proceed?"
+msgstr "ìëê íë ìëìì &quot;{0}&quot; ëëì ììí ìêíëë. ìëë êì íìêìëê?"
+
+#: ../calendar/calendar.error.xml.h:69
+msgid "Delete remote task list &quot;{0}&quot;?"
+msgstr "&quot;{0}&quot; ìê ìì ëëì ììíìêìëê?"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid ""
+"This will permanently remove the task list &quot;{0}&quot; from the server. "
+"Are you sure you want to proceed?"
+msgstr "ìëê íë ìëìì &quot;{0}&quot; ìì ëëì ììí ìêíëë. ìëë êì íìêìëê?"
+
+#: ../calendar/calendar.error.xml.h:71
+msgid "Delete remote memo list &quot;{0}&quot;?"
+msgstr "&quot;{0}&quot; ìê ëë ëëì ììíìêìëê?"
+
+#: ../calendar/calendar.error.xml.h:72
+msgid ""
+"This will permanently remove the memo list &quot;{0}&quot; from the server. "
+"Are you sure you want to proceed?"
+msgstr "ìëê íë ìëìì &quot;{0}&quot; ëë ëëì ììí ìêíëë. ìëë êì íìêìëê?"
+
+#: ../calendar/calendar.error.xml.h:73
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "ìëë ììë ìë ììì ììíìêìëê?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:74
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2084,11 +2088,11 @@ msgstr ""
 "ììì ìëìë ììëì ìì ëë ìëì ììì ëìì êí ìììì ì ì "
 "ììëë."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:75
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "ìëë ììë ìë ììì ììíìêìëê?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2096,24 +2100,24 @@ msgstr ""
 "ììì ìëìë ììëì ìì ëë ìëì ììì ëìì êí ìììì ì ì "
 "ììëë."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:77
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "ìëë ììë ìë ëëë ììíìêìëê?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:78
 msgid "Error loading calendar"
 msgstr "ëëì ììëìëë ìë"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:79
 msgid "The calendar is not marked for offline usage."
 msgstr "ì ëëì ìê ìì ìíìì ììí ì ìê íìíì ìììëë."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:80
 msgid "Cannot create a new event"
 msgstr "ì íìë ëë ì ììëë"
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:82
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
@@ -2121,12 +2125,12 @@ msgstr ""
 "'{0}'ì(ë) ìê ìì ëëìëë ëìì ëê ì ììëë. êììë ìì ëë "
 "ëêìì ëë ëëì ìííììì."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:83
 msgid "Cannot save event"
 msgstr "íìë ììí ì ììëë"
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:85
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2134,51 +2138,46 @@ msgstr ""
 "'{0}'ì(ë) ìê ìì ëëìëë ëìì ëê ì ììëë. ììì ììí ì ì"
 "ë ëë ëëì ìííììì."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:86
 msgid "Cannot save task"
 msgstr "ììì ììí ì ììëë"
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:88
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
-msgstr "'{0}'ììë íëë ììì ììíì ììëë. ëë ìì ëëì ìííììì."
+msgstr ""
+"'{0}'ììë íëë ììì ììíì ììëë. ëë ìì ëëì ìííììì."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:89
 msgid "Error loading task list"
 msgstr "ìì ëëì ììëìëë ìë"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:90
 msgid "The task list is not marked for offline usage."
 msgstr "ìì ëëì ìê ìì ìíìì ììí ì ìê íìíì ìììëë."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:91
 msgid "Error loading memo list"
 msgstr "ëë ëëì ììëìëë ìë"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:92
 msgid "The memo list is not marked for offline usage."
 msgstr "ëë ëëì ìê ìì ìíìì ììí ì ìê íìíì ìììëë."
 
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:95
 msgid "Error on {0}: {1}"
 msgstr "{0}ì ìë: {1}"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "Some features may not work properly with your current server."
-msgstr "íì ìëììë ìë êëì ìëë ëìíì ìì ìë ììëë."
+#: ../calendar/calendar.error.xml.h:96
+msgid "Could not perform this operation."
+msgstr "ì ììì ìíí ì ììëë."
 
-#: ../calendar/calendar.error.xml.h:90
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
-msgstr ""
-"ììíì ìë êëììì ìëì ìêëì ìê ëëì ìëëìì ììíëì ë"
-"ìê ëìí ìë ììëë. ìëë ììíë ëììë ìêëìëíë ê êì ì"
-"ìëë."
+#: ../calendar/calendar.error.xml.h:97 ../mail/mail.error.xml.h:167
+msgid "You must be working online to complete this operation."
+msgstr "ì ììì ëëìëë ìëììì ììíì íëë."
 
 #: ../calendar/gui/calendar-view-factory.c:88
 msgid "Day View"
@@ -2200,7 +2199,7 @@ msgstr "ìë ëê"
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:383
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "ìì"
 
@@ -2245,21 +2244,21 @@ msgstr "êì"
 msgid "is not"
 msgstr "ëë"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:800 ../calendar/gui/e-cal-model.c:807
-#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:829 ../calendar/gui/e-cal-model.c:836
+#: ../calendar/gui/e-task-table.c:555 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "êê"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:809 ../calendar/gui/e-task-table.c:559
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:838 ../calendar/gui/e-task-table.c:556
 #: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "êì"
 
 # ëë ìì
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:811 ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:840 ../calendar/gui/e-task-table.c:557
 #: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "ëë"
@@ -2277,9 +2276,9 @@ msgstr "ììì"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:861
+#: ../plugins/publish-calendar/publish-calendar.c:870
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "ìì"
 
@@ -2289,7 +2288,9 @@ msgid "Category"
 msgstr "ëë"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print-headers.c:198
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "ìë"
 
@@ -2345,22 +2346,22 @@ msgid "Edit Reminder"
 msgstr "ëë ìë íì"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:823
-#: ../calendar/gui/e-alarm-list.c:413
+#: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "ìë íì ì íì"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:824
-#: ../calendar/gui/e-alarm-list.c:409
+#: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "ììë ìì"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:825
-#: ../calendar/gui/e-alarm-list.c:421
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "íëêë ìí"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:826
-#: ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "ììëì ëëê"
 
@@ -2419,7 +2420,7 @@ msgstr "ëë ìë ëë(_R):"
 msgid "extra times every"
 msgstr "ë, ìê:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:32
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
 msgid "Options"
 msgstr "ìì"
 
@@ -2457,7 +2458,7 @@ msgid "Send To:"
 msgstr "ëë ìë:"
 
 # Trigger -> ìì ìì, Microsoft Office XP ìê
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
 msgid "Action/Trigger"
 msgstr "ëì/ìì ìì"
 
@@ -2472,88 +2473,6 @@ msgstr "ëë ìë"
 msgid "A_dd"
 msgstr "ìê(_D)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "Type:"
-msgstr "íí:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:529
-msgid "_Type:"
-msgstr "ìë(_T):"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:264 ../mail/mail-config.ui.h:9
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:286
-msgid "_Name:"
-msgstr "ìë(_N):"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:316
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "ìê ìì ìí ììì ìí ëë ëìì ëìì ëì(_Y)"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:318
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "ìê ìì ìí ììì ìí ìì ëë ëìì ëìì ëì(_Y)"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:320
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "ìê ìì ìí ììì ìí ëë ëë ëìì ëìì ëì(_Y)"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-msgid "Sh_ow reminder notifications"
-msgstr "ëë ìë íì(_O)"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:445
-msgid "Colo_r:"
-msgstr "ì(_R):"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:468
-#: ../calendar/gui/dialogs/calendar-setup.c:480
-#: ../calendar/gui/dialogs/calendar-setup.c:491
-#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:25
-#: ../modules/addressbook/addressbook-config.c:1114
-#: ../modules/addressbook/autocompletion-config.c:240
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../plugins/itip-formatter/itip-formatter.c:3240
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "ìë"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:481
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "Task List"
-msgstr "ìì ëë"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:492
-msgid "Memo List"
-msgstr "ëë ëë"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "Calendar Properties"
-msgstr "ëë ìì"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "New Calendar"
-msgstr "ì ëë"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "Task List Properties"
-msgstr "ìì ëë ìì"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "New Task List"
-msgstr "ì ìì ëë"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "Memo List Properties"
-msgstr "ëë ëë ìì"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "New Memo List"
-msgstr "ì ëë ëë"
-
 # event -> íì, Microsoft Office XP ìê
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
@@ -2603,242 +2522,253 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ëë ìíì ììëë. íìêë ìëìííìêìëê?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:278
 msgid "Could not save attachments"
 msgstr "ìëë ììí ì ììëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:625
+#: ../calendar/gui/dialogs/comp-editor.c:629
 msgid "Could not update object"
 msgstr "ìëìíë ìëìíí ì ììëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:753
+#: ../calendar/gui/dialogs/comp-editor.c:763
 msgid "Edit Appointment"
 msgstr "ìì íì"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Meeting - %s"
 msgstr "ëì - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:772
 #, c-format
 msgid "Appointment - %s"
 msgstr "ìì - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:768
+#: ../calendar/gui/dialogs/comp-editor.c:778
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "íëí ìì - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:780
 #, c-format
 msgid "Task - %s"
 msgstr "ìì - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:785
 #, c-format
 msgid "Memo - %s"
 msgstr "ëë - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:791
+#: ../calendar/gui/dialogs/comp-editor.c:801
 msgid "No Summary"
 msgstr "ìì ìì"
 
-#: ../calendar/gui/dialogs/comp-editor.c:912
+#: ../calendar/gui/dialogs/comp-editor.c:922
 msgid "Keep original item?"
 msgstr "ëë íëì ììíìêìëê?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1157
 msgid "Close the current window"
 msgstr "íì ìì ëìëë"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1132 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
+#: ../shell/e-shell-window-actions.c:1446
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
+#: ../widgets/misc/e-web-view.c:323 ../widgets/misc/e-web-view.c:1428
+#: ../widgets/misc/e-web-view-gtkhtml.c:456
+#: ../widgets/misc/e-web-view-gtkhtml.c:1299
 msgid "Copy the selection"
 msgstr "ìíí ìíì ëìíëë"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1139 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1300
+#: ../widgets/misc/e-web-view.c:1422 ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Cut the selection"
 msgstr "ìíí ìíì ìëëëë"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1146
-#: ../shell/e-shell-window-actions.c:1481
+#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
 msgid "Delete the selection"
 msgstr "ìíí ìíì ììíëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1185
 msgid "View help"
 msgstr "ëìë ëê"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1312
+#: ../widgets/misc/e-web-view.c:1434 ../widgets/misc/e-web-view-gtkhtml.c:1305
 msgid "Paste the clipboard"
 msgstr "íëëëìì ëì ëìëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1181
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Save current changes"
 msgstr "íì ëë ìí ìì"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1586
-#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:1218
+#: ../widgets/misc/e-mail-signature-editor.c:294
+msgid "Save and Close"
+msgstr "ìì í ëê"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1220
+msgid "Save current changes and close editor"
+msgstr "íì ëë ìíì ììíê íìêë ëìëë"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1558
+#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
 msgstr "ëë íìí ìí"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1195
+#: ../calendar/gui/dialogs/comp-editor.c:1234
 msgid "_Classification"
 msgstr "ëë(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1202
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:172
+#: ../mail/e-mail-browser.c:169
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "íì(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1209 ../mail/e-mail-browser.c:165
-#: ../shell/e-shell-window-actions.c:1621
-#: ../widgets/misc/e-signature-editor.c:225
+#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1593
+#: ../widgets/misc/e-mail-signature-editor.c:299
 msgid "_File"
 msgstr "íì(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1216
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1255
+#: ../shell/e-shell-window-actions.c:1600
 msgid "_Help"
 msgstr "ëìë(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "_Insert"
 msgstr "ëê(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "ìì(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../mail/e-mail-browser.c:179
-#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
+#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
+#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "ëê(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1247
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "ìë(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 #: ../composer/e-composer-actions.c:290
 #: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "íìì ìëíëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "_Categories"
 msgstr "ëë(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Toggles whether to display categories"
 msgstr "ëëë íìíì íêíëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "Time _Zone"
 msgstr "íì ìêë(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1267
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the time zone is displayed"
 msgstr "íì ìêë íëì íìíì íêíëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Pu_blic"
 msgstr "êê(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1317
 msgid "Classify as public"
 msgstr "êêë ëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "_Private"
 msgstr "êì ìë(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 msgid "Classify as private"
 msgstr "êì ìëë ëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Confidential"
 msgstr "ëë(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 msgid "Classify as confidential"
 msgstr "ëëë ëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 msgid "R_ole Field"
 msgstr "ìí íë(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1341
 msgid "Toggles whether the Role field is displayed"
 msgstr "ìí íëì íìíì íêíëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1308
+#: ../calendar/gui/dialogs/comp-editor.c:1347
 msgid "_RSVP"
 msgstr "ìëëë(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1349
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ìëìì íëì íìíì íêíëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/comp-editor.c:1355
 msgid "_Status Field"
 msgstr "ìí íë(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "Toggles whether the Status field is displayed"
 msgstr "ìí íëì íìíì íêíëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 msgid "_Type Field"
 msgstr "ìë íë(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:1365
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ììì ìëë íìíì íêíëë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:2114
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "ìë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2393
-#: ../calendar/gui/dialogs/comp-editor.c:2556
-#: ../calendar/gui/dialogs/comp-editor.c:3548
+#: ../calendar/gui/dialogs/comp-editor.c:2463
+#: ../calendar/gui/dialogs/comp-editor.c:2647
+#: ../calendar/gui/dialogs/comp-editor.c:3651
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ìëìíê ëìíë ì íëì ëí ëë ìíì ëëëë."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3512
-#: ../plugins/prefer-plain/prefer-plain.c:66
+#: ../calendar/gui/dialogs/comp-editor.c:3615
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
 msgid "attachment"
 msgstr "ìë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3580
+#: ../calendar/gui/dialogs/comp-editor.c:3683
 msgid "Unable to use current version!"
 msgstr "íì ëìì ììí ì ììëë!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:438
+#: ../calendar/gui/dialogs/comp-editor-page.c:439
 #, c-format
 msgid "Validation error: %s"
 msgstr "ìíì êì ìë: %s"
@@ -3001,13 +2931,13 @@ msgstr "ìì ìì/ìì(_F):"
 msgid "Query free / busy information for the attendees"
 msgstr "ìììì ìì ìì/ìì ìëë ììëëë"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3327
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3324
 msgid "Appointment"
 msgstr "ìì"
 
 #: ../calendar/gui/dialogs/event-editor.c:388
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-list-view.c:166
 msgid "Attendees"
 msgstr "ììì"
 
@@ -3016,101 +2946,88 @@ msgstr "ììì"
 msgid "Print this event"
 msgstr "ì íìë ììíëë"
 
-#: ../calendar/gui/dialogs/event-page.c:566
+#: ../calendar/gui/dialogs/event-page.c:570
 msgid "Event's start time is in the past"
 msgstr "íìì ìì ìêì êêìëë"
 
-#: ../calendar/gui/dialogs/event-page.c:643
+#: ../calendar/gui/dialogs/event-page.c:647
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "íìë íìí ì ììëë. ìíí ëëì ìê ìììëë"
 
-#: ../calendar/gui/dialogs/event-page.c:647
+#: ../calendar/gui/dialogs/event-page.c:651
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "íì ììë íìí ì ììëë. ìììê ìëëë"
 
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:659
-#: ../calendar/gui/dialogs/event-page.c:3101
+#: ../calendar/gui/dialogs/event-page.c:663
+#: ../calendar/gui/dialogs/event-page.c:3143
 msgid "This event has reminders"
 msgstr "íìì ëë ìëì ììëë"
 
-#: ../calendar/gui/dialogs/event-page.c:726
+#: ../calendar/gui/dialogs/event-page.c:730
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "ììì(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1285
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Event with no start date"
 msgstr "íìì ìì ëìê ììëë"
 
-#: ../calendar/gui/dialogs/event-page.c:1288
+#: ../calendar/gui/dialogs/event-page.c:1304
 msgid "Event with no end date"
 msgstr "íìì ë ëìê ììëë"
 
-#: ../calendar/gui/dialogs/event-page.c:1461
-#: ../calendar/gui/dialogs/memo-page.c:723
-#: ../calendar/gui/dialogs/task-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:1477
+#: ../calendar/gui/dialogs/memo-page.c:732
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "ìì ëìê íëìëë"
 
-#: ../calendar/gui/dialogs/event-page.c:1471
+#: ../calendar/gui/dialogs/event-page.c:1487
 msgid "End date is wrong"
 msgstr "ë ëìê íëìëë"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1510
 msgid "Start time is wrong"
 msgstr "ìì ìêì íëìëë"
 
-#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/event-page.c:1517
 msgid "End time is wrong"
 msgstr "ë ìêì íëìëë"
 
-#: ../calendar/gui/dialogs/event-page.c:1664
-#: ../calendar/gui/dialogs/memo-page.c:762
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1680
+#: ../calendar/gui/dialogs/memo-page.c:771
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "ìììê íìíëë."
 
-#: ../calendar/gui/dialogs/event-page.c:1698
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1714
+#: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "ììí ìììê í ìëì íìíëë."
 
-#: ../calendar/gui/dialogs/event-page.c:1905
+#: ../calendar/gui/dialogs/event-page.c:1921
 msgid "_Delegatees"
 msgstr "ëëì(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1907
+#: ../calendar/gui/dialogs/event-page.c:1923
 msgid "Atte_ndees"
 msgstr "ììì(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2998
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "'%s' ëëì ì ì ììëë: %s"
 
-#. Translators: This string is used when we are creating an Event
-#. * (meeting or appointment)  on behalf of some other user
-#. Translators: This string is used when we are creating a Memo
-#. * 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:3019
-#: ../calendar/gui/dialogs/memo-page.c:1025
-#: ../calendar/gui/dialogs/task-page.c:1858
-#, c-format
-msgid "You are acting on behalf of %s"
-msgstr "%s ìêìë ììíëë"
-
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:3361
+#: ../calendar/gui/dialogs/event-page.c:3423
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ìì %dì ìì"
 
-#: ../calendar/gui/dialogs/event-page.c:3367
+#: ../calendar/gui/dialogs/event-page.c:3429
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -3118,18 +3035,18 @@ msgstr[0] "ìì %dìê ìì"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:3373
+#: ../calendar/gui/dialogs/event-page.c:3435
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ìì %dë ìì"
 
-#: ../calendar/gui/dialogs/event-page.c:3392
+#: ../calendar/gui/dialogs/event-page.c:3454
 msgid "Customize"
 msgstr "ììì ìì"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3398
+#: ../calendar/gui/dialogs/event-page.c:3460
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "ìì"
@@ -3175,7 +3092,6 @@ msgid "1 day before appointment"
 msgstr "ìì íë ìì"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "ìì(_L):"
 
@@ -3272,11 +3188,11 @@ msgid "Select Date"
 msgstr "ëì ìí"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Select _Today"
 msgstr "ìë ìí(_T)"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3331
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3328
 msgid "Memo"
 msgstr "ëë"
 
@@ -3284,38 +3200,53 @@ msgstr "ëë"
 msgid "Print this memo"
 msgstr "ì ëë ìì"
 
-#: ../calendar/gui/dialogs/memo-page.c:423
+#: ../calendar/gui/dialogs/memo-page.c:429
 msgid "Memo's start date is in the past"
 msgstr "ëëì ìì ëìê êêìëë"
 
-#: ../calendar/gui/dialogs/memo-page.c:460
+#: ../calendar/gui/dialogs/memo-page.c:465
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ëëë íìí ì ììëë. ìíí ëë ëëì ìê ìììëë"
 
-#: ../calendar/gui/dialogs/memo-page.c:464
+#: ../calendar/gui/dialogs/memo-page.c:469
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ëë ììë íìí ì ììëë. ìììê ìëëë"
 
-#: ../calendar/gui/dialogs/memo-page.c:949
+#: ../calendar/gui/dialogs/memo-page.c:981
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "'%s'ì ëëë ì ì ììëë: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1156 ../em-format/em-format.c:1065
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2666
-#: ../mail/em-format-html.c:2731 ../mail/em-format-html.c:2755
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:983
+#: ../em-format/e-mail-parser-application-mbox.c:111
+#: ../em-format/e-mail-parser-application-smime.c:107
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:96
+#: ../em-format/e-mail-parser-multipart-encrypted.c:122
+#: ../em-format/e-mail-parser-multipart-signed.c:147
+#: ../libemail-engine/mail-ops.c:720 ../mail/e-mail-reader.c:1727
+#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4524
+#: ../modules/itip-formatter/itip-view.c:4875 ../plugins/face/face.c:174
+#: ../smime/gui/certificate-manager.c:317
+msgid "Unknown error"
+msgstr "ì ì ìë ìëê ëìíìëë"
+
+#: ../calendar/gui/dialogs/memo-page.c:1173
+#: ../em-format/e-mail-formatter.c:1370
+#: ../em-format/e-mail-formatter-utils.c:180
+#: ../em-format/e-mail-formatter-utils.c:203 ../mail/em-filter-i18n.h:77
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:69
 msgid "To"
 msgstr "ëë ìë"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:342
+#: ../calendar/gui/dialogs/task-page.c:346
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_List:"
 msgstr "ëë(_L):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:350
+#: ../calendar/gui/dialogs/task-page.c:354
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "ììì(_Z):"
@@ -3372,21 +3303,21 @@ msgstr "ì êì ë ììëì êì"
 msgid "All Instances"
 msgstr "ëë êì"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:576
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ì ìììë ìëëììì íìí ì ìë ëëì ëì ììëë."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:965
+#: ../calendar/gui/dialogs/recurrence-page.c:969
 msgid "Recurrence date is invalid"
 msgstr "ëëíë ëìê ìëëììëë"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1005
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
 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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "on"
 msgstr "ìì"
 
@@ -3394,7 +3325,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:1098
+#: ../calendar/gui/dialogs/recurrence-page.c:1102
 msgid "first"
 msgstr "ìëì"
 
@@ -3403,7 +3334,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:1104
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "second"
 msgstr "ëëì"
 
@@ -3411,7 +3342,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:1109
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "third"
 msgstr "ìëì"
 
@@ -3419,7 +3350,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:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fourth"
 msgstr "ëëì"
 
@@ -3427,7 +3358,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:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 msgid "fifth"
 msgstr "ëìëì"
 
@@ -3435,13 +3366,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:1124
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
 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:1148
+#: ../calendar/gui/dialogs/recurrence-page.c:1152
 msgid "Other Date"
 msgstr "êí ëì"
 
@@ -3449,7 +3380,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:1154
+#: ../calendar/gui/dialogs/recurrence-page.c:1158
 msgid "1st to 10th"
 msgstr "1ìëí 10ì"
 
@@ -3457,7 +3388,7 @@ msgstr "1ìëí 10ì"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1164
 msgid "11th to 20th"
 msgstr "11ìëí 20ì"
 
@@ -3465,41 +3396,41 @@ msgstr "11ìëí 20ì"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "21st to 31st"
 msgstr "21ìëí 31ì"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
 #: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "ììì"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "íìì"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../calendar/gui/dialogs/recurrence-page.c:1198
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "ììì"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/gui/dialogs/recurrence-page.c:1199
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "ëìì"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1200
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "êìì"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1201
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "íìì"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../calendar/gui/dialogs/recurrence-page.c:1202
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "ììì"
@@ -3509,33 +3440,33 @@ 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:1322
+#: ../calendar/gui/dialogs/recurrence-page.c:1326
 msgid "on the"
 msgstr "êê:"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:1501
+#: ../calendar/gui/dialogs/recurrence-page.c:1505
 msgid "occurrences"
 msgstr "ë"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2217
+#: ../calendar/gui/dialogs/recurrence-page.c:2221
 msgid "Add exception"
 msgstr "ìì ìê"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2258
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
 msgid "Could not get a selection to modify."
 msgstr "êì ìí ìíì ìì ì ì ììëë."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2264
+#: ../calendar/gui/dialogs/recurrence-page.c:2268
 msgid "Modify exception"
 msgstr "ìì ìì"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2308
+#: ../calendar/gui/dialogs/recurrence-page.c:2312
 msgid "Could not get a selection to delete."
 msgstr "ìì ìí ìíì ìì ì ì ììëë."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2447
+#: ../calendar/gui/dialogs/recurrence-page.c:2451
 msgid "Date/Time"
 msgstr "ëì/ìê"
 
@@ -3609,7 +3540,7 @@ msgstr "ë"
 msgid "Exceptions"
 msgstr "ìì"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "Preview"
 msgstr "ëë ëê"
 
@@ -3633,79 +3564,77 @@ msgstr "ì íìì"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:326
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:345
+#: ../calendar/gui/e-task-table.c:579 ../calendar/gui/tasktypes.xml.h:19
+#: ../mail/message-list.c:1275 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
 msgstr "ëì"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:328
-#: ../calendar/gui/e-cal-model.c:1623 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
+#: ../calendar/gui/e-cal-component-preview.c:347
+#: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1274
 #: ../widgets/misc/e-send-options.ui.h:5
 msgid "Normal"
 msgstr "ëí"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:330
-#: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:349
+#: ../calendar/gui/e-task-table.c:581 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1273 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
 msgstr "ëì"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:585 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:22
 #: ../widgets/misc/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "ìììë"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:311
-#: ../calendar/gui/e-cal-model-tasks.c:490
-#: ../calendar/gui/e-cal-model-tasks.c:775 ../calendar/gui/e-task-table.c:230
-#: ../calendar/gui/e-task-table.c:245 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:331
+#: ../calendar/gui/e-cal-model-tasks.c:489
+#: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:227
+#: ../calendar/gui/e-task-table.c:242 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3405 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "ìì ìí"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:301
-#: ../calendar/gui/e-cal-model-tasks.c:492
-#: ../calendar/gui/e-cal-model-tasks.c:777
-#: ../calendar/gui/e-cal-model-tasks.c:855 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:247 ../calendar/gui/e-task-table.c:660
-#: ../calendar/gui/print.c:3411
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model-tasks.c:491
+#: ../calendar/gui/e-cal-model-tasks.c:776
+#: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:229
+#: ../calendar/gui/e-task-table.c:244 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3408
 msgid "In Progress"
 msgstr "ìíì"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:304
-#: ../calendar/gui/e-cal-model-tasks.c:494
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-meeting-store.c:214 ../calendar/gui/e-meeting-store.c:237
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:249
-#: ../calendar/gui/e-task-table.c:661 ../calendar/gui/print.c:3414
+#: ../calendar/gui/e-cal-component-preview.c:324
+#: ../calendar/gui/e-cal-model-tasks.c:493
+#: ../calendar/gui/e-cal-model-tasks.c:778
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:246
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3411
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 msgstr "ìëë"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../calendar/gui/e-cal-model-tasks.c:496
-#: ../calendar/gui/e-cal-model-tasks.c:781 ../calendar/gui/e-task-table.c:236
-#: ../calendar/gui/e-task-table.c:251 ../calendar/gui/e-task-table.c:662
-#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
+#: ../calendar/gui/e-cal-component-preview.c:327
+#: ../calendar/gui/e-cal-model-tasks.c:495
+#: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:879
 msgid "Canceled"
 msgstr "ììí"
 
@@ -3713,8 +3642,8 @@ msgstr "ììí"
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:17
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3522
-#: ../calendar/gui/e-meeting-list-view.c:680
+#: ../calendar/gui/e-cal-model.c:3624
+#: ../calendar/gui/e-meeting-list-view.c:684
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:1
@@ -3754,46 +3683,47 @@ msgstr "ëëë ììì ììí ìí ìëë ëêêë ëëë"
 msgid "_Send Options"
 msgstr "ëëê ìì(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3329
+#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3326
 #: ../widgets/misc/e-send-options.c:553
 msgid "Task"
 msgstr "ìì"
 
-#: ../calendar/gui/dialogs/task-editor.c:324
+#: ../calendar/gui/dialogs/task-editor.c:307
 msgid "Task Details"
 msgstr "ìì ììí"
 
-#: ../calendar/gui/dialogs/task-editor.c:368
+#: ../calendar/gui/dialogs/task-editor.c:351
 msgid "Print this task"
 msgstr "ì ìì ìì"
 
-#: ../calendar/gui/dialogs/task-page.c:254
+#: ../calendar/gui/dialogs/task-page.c:259
 msgid "Task's start date is in the past"
 msgstr "ììì ìì ëìê êêìëë"
 
-#: ../calendar/gui/dialogs/task-page.c:255
+#: ../calendar/gui/dialogs/task-page.c:260
 msgid "Task's due date is in the past"
 msgstr "ììì ëê ëìê êêìëë"
 
-#: ../calendar/gui/dialogs/task-page.c:289
+#: ../calendar/gui/dialogs/task-page.c:293
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ììì íìí ì ììëë. ìíí ìì ëëì ìê ìììëë"
 
-#: ../calendar/gui/dialogs/task-page.c:293
+#: ../calendar/gui/dialogs/task-page.c:297
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ìì ììë íìí ì ììëë. ìììê ìëëë"
 
-#: ../calendar/gui/dialogs/task-page.c:297
+#: ../calendar/gui/dialogs/task-page.c:301
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
-msgstr "ììì íìí ì ììëë. ìíí ìì ëëì íëë ììì ììíì ììëë"
+msgstr ""
+"ììì íìí ì ììëë. ìíí ìì ëëì íëë ììì ììíì ììëë"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "ëê ëìê ìëëììëë"
 
-#: ../calendar/gui/dialogs/task-page.c:1777
+#: ../calendar/gui/dialogs/task-page.c:1813
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "'%s'ì ììì ì ì ììëë: %s"
@@ -3903,14 +3833,14 @@ msgstr "ëë ëê, ì ëì"
 msgid "a table to view and select the current time range"
 msgstr "íì ìê êêì ëê ìííë í"
 
-#: ../calendar/gui/ea-gnome-calendar.c:50
-#: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:1118
 msgid "Gnome Calendar"
 msgstr "êë ëë"
 
-#: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1085
 msgid "%A %d %b %Y"
 msgstr "%Yë %b %dì %A"
 
@@ -3920,30 +3850,30 @@ msgstr "%Yë %b %dì %A"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1850
-#: ../calendar/gui/e-day-view-top-item.c:837
+#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1853
+#: ../calendar/gui/e-day-view-top-item.c:835
 #: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%a %d %b"
 msgstr "%b %eì (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../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
+#: ../modules/calendar/e-cal-shell-view-private.c:1092
+#: ../modules/calendar/e-cal-shell-view-private.c:1098
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
 msgid "%a %d %b %Y"
 msgstr "%Yë %b %eì (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../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
+#: ../modules/calendar/e-cal-shell-view-private.c:1118
+#: ../modules/calendar/e-cal-shell-view-private.c:1129
+#: ../modules/calendar/e-cal-shell-view-private.c:1136
+#: ../modules/calendar/e-cal-shell-view-private.c:1139
 msgid "%d %b %Y"
 msgstr "%Yë %b %eì"
 
@@ -3952,10 +3882,10 @@ msgstr "%Yë %b %eì"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1866
-#: ../calendar/gui/e-day-view-top-item.c:841
+#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1869
+#: ../calendar/gui/e-day-view-top-item.c:839
 #: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
+#: ../modules/calendar/e-cal-shell-view-private.c:1125
 msgid "%d %b"
 msgstr "%b %d"
 
@@ -3969,68 +3899,68 @@ msgid "Click here, you can find more events."
 msgstr "ìêë ëëë ë ëì ìëíë ìì ì ììëë."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:359
+#: ../calendar/gui/e-alarm-list.c:358
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%dì"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:365
+#: ../calendar/gui/e-alarm-list.c:364
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%dì"
 
-#: ../calendar/gui/e-alarm-list.c:427
+#: ../calendar/gui/e-alarm-list.c:426
 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:441
+#: ../calendar/gui/e-alarm-list.c:440
 #, 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:446
+#: ../calendar/gui/e-alarm-list.c:445
 #, 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:453
+#: ../calendar/gui/e-alarm-list.c:452
 #, 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:464
+#: ../calendar/gui/e-alarm-list.c:463
 #, 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:469
+#: ../calendar/gui/e-alarm-list.c:468
 #, 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:476
+#: ../calendar/gui/e-alarm-list.c:475
 #, 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:500
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at %s"
 msgstr "%s (%s)"
@@ -4038,7 +3968,7 @@ msgstr "%s (%s)"
 # Trigger -> ìì ìì, Microsoft Office XP ìê
 #. 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:508
+#: ../calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "ì ì ìë ìì ììì ëí %s"
@@ -4061,42 +3991,47 @@ msgstr "í ë ëìë ëë ëê"
 msgid "calendar view for one or more weeks"
 msgstr "ì ëìë ëë ëê"
 
-#: ../calendar/gui/e-cal-component-preview.c:201 ../filter/e-filter-rule.c:691
+#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:748
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "ìë ìì"
 
-#: ../calendar/gui/e-cal-component-preview.c:207
+#: ../calendar/gui/e-cal-component-preview.c:245
 msgid "Categories:"
 msgstr "ëë:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:276
 msgid "Summary:"
 msgstr "ìì:"
 
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:284
 msgid "Start Date:"
 msgstr "ìì ëì:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:295
+msgid "End Date:"
+msgstr "ë ëì:"
+
+#: ../calendar/gui/e-cal-component-preview.c:306
 msgid "Due Date:"
 msgstr "ëê ëì:"
 
-#. Status
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../plugins/itip-formatter/itip-view.c:1082
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../modules/itip-formatter/itip-view.c:1463
+#: ../modules/itip-formatter/itip-view.c:1578
 msgid "Status:"
 msgstr "ìí:"
 
-#: ../calendar/gui/e-cal-component-preview.c:324
+#: ../calendar/gui/e-cal-component-preview.c:343
 msgid "Priority:"
 msgstr "ìì ìì:"
 
-#: ../calendar/gui/e-cal-component-preview.c:349 ../mail/mail-config.ui.h:159
+#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "ìë:"
 
-#: ../calendar/gui/e-cal-component-preview.c:380
+#: ../calendar/gui/e-cal-component-preview.c:397
 msgid "Web Page:"
 msgstr "ì íìì:"
 
@@ -4109,10 +4044,10 @@ msgid "Start date"
 msgstr "ìì ëì"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:640
+#: ../calendar/gui/e-meeting-list-view.c:644
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:139
+#: ../mail/e-mail-account-tree-view.c:157
 #: ../widgets/misc/e-attachment-tree-view.c:586
 msgid "Type"
 msgstr "íí"
@@ -4121,7 +4056,7 @@ msgstr "íí"
 msgid "Completion date"
 msgstr "ìë ëì"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:881
 msgid "Complete"
 msgstr "ìë"
 
@@ -4136,14 +4071,14 @@ msgstr "% ìë"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Priority"
 msgstr "ìììì"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "ëë"
 
@@ -4169,21 +4104,21 @@ msgstr "íëëëìì íìë ëì ëìëë"
 msgid "Delete selected events"
 msgstr "ìíí íìë ììíëë"
 
-#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:198
-#: ../calendar/gui/e-task-table.c:286
+#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:195
+#: ../calendar/gui/e-task-table.c:283
 msgid "Deleting selected objects"
 msgstr "ìíí ìëìíë ììíë ììëë"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:875
+#: ../calendar/gui/e-task-table.c:1158
 msgid "Updating objects"
 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:1973 ../calendar/gui/e-memo-table.c:555
-#: ../calendar/gui/e-task-table.c:827
+#: ../calendar/gui/e-calendar-view.c:1992 ../calendar/gui/e-memo-table.c:552
+#: ../calendar/gui/e-task-table.c:824
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ììì: %s <%s>"
@@ -4191,20 +4126,20 @@ msgstr "ììì: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1977 ../calendar/gui/e-memo-table.c:560
-#: ../calendar/gui/e-task-table.c:831
+#: ../calendar/gui/e-calendar-view.c:1996 ../calendar/gui/e-memo-table.c:557
+#: ../calendar/gui/e-task-table.c:828
 #, c-format
 msgid "Organizer: %s"
 msgstr "ììì: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1993 ../calendar/gui/print.c:3363
+#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3360
 #, c-format
 msgid "Location: %s"
 msgstr "ìì: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2024
+#: ../calendar/gui/e-calendar-view.c:2043
 #, c-format
 msgid "Time: %s %s"
 msgstr "ìê: %s %s"
@@ -4218,86 +4153,86 @@ msgstr "ìì ëì"
 msgid "End Date"
 msgstr "ë ëì"
 
-#: ../calendar/gui/e-cal-model.c:813 ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:242 ../calendar/gui/print.c:1162
-#: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-meeting-list-view.c:186
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
+#: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3462
+#: ../modules/itip-formatter/itip-view.c:5962
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:475
-#: ../plugins/itip-formatter/itip-formatter.c:2885
 msgid "Unknown"
 msgstr "ì ì ìì"
 
-#: ../calendar/gui/e-cal-model.c:1625
+#: ../calendar/gui/e-cal-model.c:1657
 msgid "Recurring"
 msgstr "ëëë"
 
-#: ../calendar/gui/e-cal-model.c:1627
+#: ../calendar/gui/e-cal-model.c:1659
 msgid "Assigned"
 msgstr "ììë"
 
-#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:1062
+#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:1075
 msgid "Yes"
 msgstr "ì"
 
-#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:211
+#: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "ìëì"
 
-#: ../calendar/gui/e-cal-model.c:3021
+#: ../calendar/gui/e-cal-model.c:3114
 #, c-format
 msgid "Opening %s"
 msgstr "%s ìë ììëë"
 
-#: ../calendar/gui/e-cal-model.c:3466
-#: ../calendar/gui/e-meeting-list-view.c:218
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../plugins/itip-formatter/itip-formatter.c:2873
+#: ../calendar/gui/e-cal-model.c:3565
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../modules/itip-formatter/itip-view.c:5950
 msgid "Accepted"
 msgstr "ìë"
 
-#: ../calendar/gui/e-cal-model.c:3467
-#: ../calendar/gui/e-meeting-list-view.c:219
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
-#: ../plugins/itip-formatter/itip-formatter.c:2879
+#: ../calendar/gui/e-cal-model.c:3566
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:5956
 msgid "Declined"
 msgstr "êë"
 
-#: ../calendar/gui/e-cal-model.c:3468
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-cal-model.c:3567
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
 #: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "Tentative"
 msgstr "ììì"
 
-#: ../calendar/gui/e-cal-model.c:3469
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/e-meeting-store.c:235
-#: ../plugins/itip-formatter/itip-formatter.c:2882
+#: ../calendar/gui/e-cal-model.c:3568
+#: ../calendar/gui/e-meeting-list-view.c:225
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../modules/itip-formatter/itip-view.c:5959
 msgid "Delegated"
 msgstr "ëë"
 
-#: ../calendar/gui/e-cal-model.c:3470
+#: ../calendar/gui/e-cal-model.c:3569
 msgid "Needs action"
 msgstr "ëì íì"
 
 #: ../calendar/gui/e-cal-model-calendar.c:157
-#: ../calendar/gui/e-task-table.c:636
+#: ../calendar/gui/e-task-table.c:633
 msgid "Free"
 msgstr "ìì ìì"
 
 #: ../calendar/gui/e-cal-model-calendar.c:160
-#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:634
 msgid "Busy"
 msgstr "ìì ìì"
 
-#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:720
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4308,22 +4243,22 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:773
+#: ../calendar/gui/e-cal-model-tasks.c:772
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "ìì"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:166
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:174
+#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4333,16 +4268,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:774
-#: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
-#: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
+#: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
+#: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
 msgid "am"
 msgstr "ìì"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1025 ../calendar/gui/e-week-view.c:777
-#: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
-#: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
+#: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
+#: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
 msgid "pm"
 msgstr "ìí"
 
@@ -4352,13 +4287,13 @@ msgstr "ìí"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1833 ../calendar/gui/e-day-view-top-item.c:833
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1982
+#: ../calendar/gui/e-day-view.c:1836 ../calendar/gui/e-day-view-top-item.c:831
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
 msgid "%A %d %B"
 msgstr "%B %dì %A"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2650
+#: ../calendar/gui/e-day-view.c:2671
 #, c-format
 msgid "Week %d"
 msgstr "%dì"
@@ -4369,131 +4304,129 @@ msgstr "%dì"
 #. * 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:791
+#: ../calendar/gui/e-day-view-time-item.c:790
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02ië ëì"
 
-#: ../calendar/gui/e-day-view-time-item.c:816
+#: ../calendar/gui/e-day-view-time-item.c:815
 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:833
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
+#: ../calendar/gui/e-day-view-time-item.c:832
+#: ../modules/calendar/e-calendar-preferences.c:185
+#: ../modules/calendar/e-calendar-preferences.c:237
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "ìì"
 
-#: ../calendar/gui/e-day-view-time-item.c:867
+#: ../calendar/gui/e-day-view-time-item.c:866
 #: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:262
+#: ../modules/calendar/e-calendar-preferences.c:268
 msgid "Select..."
 msgstr "ìí..."
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Chair Persons"
 msgstr "ìì"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Required Participants"
 msgstr "íì ììì"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Optional Participants"
 msgstr "ìí ììì"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Resources"
 msgstr "ìì"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:1056 ../calendar/gui/print.c:1158
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1155
 msgid "Individual"
 msgstr "êì"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1156 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "ëì"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:1160
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/print.c:1157
 msgid "Resource"
 msgstr "ìì"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1161
+#: ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:1158
 msgid "Room"
 msgstr "ë"
 
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/print.c:1175
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1172
 msgid "Chair"
 msgstr "ìì"
 
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:1059 ../calendar/gui/print.c:1176
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1173
 msgid "Required Participant"
 msgstr "íì ììì"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:158 ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/print.c:1177
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/print.c:1174
 msgid "Optional Participant"
 msgstr "ìí ììì"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:160 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/print.c:1178
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/print.c:1175
 msgid "Non-Participant"
 msgstr "ëìì"
 
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-meeting-store.c:1069
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:1082
 msgid "Needs Action"
 msgstr "ëì íì"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:615
+#: ../calendar/gui/e-meeting-list-view.c:619
 msgid "Attendee                          "
 msgstr "ììì"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:667
+#: ../calendar/gui/e-meeting-list-view.c:671
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "ìëëë"
 
-#: ../calendar/gui/e-meeting-store.c:216 ../calendar/gui/e-meeting-store.c:239
+#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "ìíì"
 
 # free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
-#: ../calendar/gui/e-meeting-store.c:1887
+#: ../calendar/gui/e-meeting-store.c:1906
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "ìë %sì %s ìììë ìì ìì/ìì ìëì ìêí ìíë ìëíììì."
 
-#: ../calendar/gui/e-meeting-store.c:1897
+#: ../calendar/gui/e-meeting-store.c:1916
 #, c-format
 msgid "Failure reason: %s"
 msgstr "ìí ìì: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1902
-#: ../plugins/caldav/caldav-browse-server.c:958
-#: ../plugins/google-account-setup/google-source.c:453
-#: ../plugins/publish-calendar/publish-calendar.c:339
+#: ../calendar/gui/e-meeting-store.c:1921
+#: ../plugins/publish-calendar/publish-calendar.c:335
 #: ../smime/gui/component.c:54
 msgid "Enter password"
 msgstr "ìíë ìëíììì"
@@ -4584,47 +4517,46 @@ msgstr "êí ìë"
 msgid "Language"
 msgstr "ìì"
 
-#: ../calendar/gui/e-memo-table.c:436
-#: ../modules/calendar/e-cal-shell-content.c:474
-#: ../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:459
+#: ../calendar/gui/e-memo-table.c:433
+#: ../modules/calendar/e-cal-shell-content.c:476
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:248
+#: ../modules/calendar/e-memo-shell-view.c:306
 msgid "Memos"
 msgstr "ëë"
 
-#: ../calendar/gui/e-memo-table.c:517 ../calendar/gui/e-task-table.c:790
+#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:787
 msgid "* No Summary *"
 msgstr "* ìì ìì *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:874
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:871
 msgid "Start: "
 msgstr "ìì: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:623 ../calendar/gui/e-task-table.c:892
+#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:889
 msgid "Due: "
 msgstr "êí: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:739
 msgid "Cut selected memos to the clipboard"
 msgstr "ìíí ëëë íëëëë ìë ëëë"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:745
 msgid "Copy selected memos to the clipboard"
 msgstr "ìíí ëëë íëëëë ëìíëë"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:751
 msgid "Paste memos from the clipboard"
 msgstr "íëëëìì ëëë ëì ëìëë"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../calendar/gui/e-memo-table.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:611
 msgid "Delete selected memos"
 msgstr "ìíí ëëë ììíëë"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:763
 msgid "Select all visible memos"
 msgstr "ëìë ëë ëìì ìí"
 
@@ -4636,41 +4568,40 @@ msgstr "ëëë ìêíëë ëëììì"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:611
+#: ../calendar/gui/e-task-table.c:608
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2287
-#: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1048
+#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2284
+#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:1082
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:435
-#: ../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:457
+#: ../modules/calendar/e-cal-shell-content.c:437
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:271
+#: ../modules/calendar/e-task-shell-view.c:461
 msgid "Tasks"
 msgstr "ìì"
 
-#: ../calendar/gui/e-task-table.c:1025
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Cut selected tasks to the clipboard"
 msgstr "ìíí ììì íëëëë ìëëëë"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1028
 msgid "Copy selected tasks to the clipboard"
 msgstr "ìíí ììì íëëëë ëìíëë"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1034
 msgid "Paste tasks from the clipboard"
 msgstr "íëëëìì ììì ëì ëìëë"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../calendar/gui/e-task-table.c:1040
+#: ../modules/calendar/e-task-shell-view-actions.c:735
 msgid "Delete selected tasks"
 msgstr "ìíí ììì ììíëë"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1046
 msgid "Select all visible tasks"
 msgstr "ëìë ëë ìì ìí"
 
@@ -4681,42 +4612,42 @@ 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:239 ../calendar/gui/print.c:1963
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1960
 msgid "%d %B"
 msgstr "%B %eì"
 
-#: ../calendar/gui/gnome-cal.c:2253
+#: ../calendar/gui/gnome-cal.c:2315
 msgid "Purging"
 msgstr "ëìë ì"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:571
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:819
 msgid "An organizer must be set."
 msgstr "ìììë êìíì íëë."
 
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "ìììê ììí í ìëì íìíëë"
 
 # event -> íì, Microsoft Office XP ìê
-#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
+#: ../calendar/gui/itip-utils.c:906 ../calendar/gui/itip-utils.c:1067
 msgid "Event information"
 msgstr "íì ìë"
 
-#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
+#: ../calendar/gui/itip-utils.c:909 ../calendar/gui/itip-utils.c:1070
 msgid "Task information"
 msgstr "ìì ìë"
 
-#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:912 ../calendar/gui/itip-utils.c:1073
 msgid "Memo information"
 msgstr "ëë ìë"
 
 # free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
-#: ../calendar/gui/itip-utils.c:779 ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:915 ../calendar/gui/itip-utils.c:1091
 msgid "Free/Busy information"
 msgstr "ìì ìì/ìì ìë"
 
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:918
 msgid "Calendar information"
 msgstr "ëë ìë"
 
@@ -4724,7 +4655,7 @@ msgstr "ëë ìë"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:955
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ìë"
@@ -4733,7 +4664,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:826
+#: ../calendar/gui/itip-utils.c:962
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ììììë ìë"
@@ -4745,7 +4676,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:833 ../calendar/gui/itip-utils.c:881
+#: ../calendar/gui/itip-utils.c:969 ../calendar/gui/itip-utils.c:1017
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "êì"
@@ -4754,7 +4685,7 @@ msgstr "êì"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:976
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ëë"
@@ -4762,7 +4693,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:853
+#: ../calendar/gui/itip-utils.c:989
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ìëìíë"
@@ -4770,7 +4701,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:860
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ìì"
@@ -4779,7 +4710,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:867
+#: ../calendar/gui/itip-utils.c:1003
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ìëì ìí"
@@ -4787,191 +4718,191 @@ 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:874
+#: ../calendar/gui/itip-utils.c:1010
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ëëìì"
 
 # free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
-#: ../calendar/gui/itip-utils.c:952
+#: ../calendar/gui/itip-utils.c:1088
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ìì ìì/ìì ìë (%sëí %sêì)"
 
-#: ../calendar/gui/itip-utils.c:960
+#: ../calendar/gui/itip-utils.c:1096
 msgid "iCalendar information"
 msgstr "iCalendar ìë"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:1123
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "ëììë ììí ì ììëë. ì íìê ëë íìì ìëíëë."
 
-#: ../calendar/gui/itip-utils.c:991
+#: ../calendar/gui/itip-utils.c:1127
 msgid "Unable to book a resource, error: "
 msgstr "ëììë ììí ì ììëë. ìëë:"
 
 # event -> íì, Microsoft Office XP ìê
-#: ../calendar/gui/itip-utils.c:1156
+#: ../calendar/gui/itip-utils.c:1306
 msgid "You must be an attendee of the event."
 msgstr "ì íìì ììììì íëë."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "1st"
 msgstr "1ì"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "2nd"
 msgstr "2ì"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "3rd"
 msgstr "3ì"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "4th"
 msgstr "4ì"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "5th"
 msgstr "5ì"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "6th"
 msgstr "6ì"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "7th"
 msgstr "7ì"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "8th"
 msgstr "8ì"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "9th"
 msgstr "9ì"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "10th"
 msgstr "10ì"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "11th"
 msgstr "11ì"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "12th"
 msgstr "12ì"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "13th"
 msgstr "13ì"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "14th"
 msgstr "14ì"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "15th"
 msgstr "15ì"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "16th"
 msgstr "16ì"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "17th"
 msgstr "17ì"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "18th"
 msgstr "18ì"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "19th"
 msgstr "19ì"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "20th"
 msgstr "20ì"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "21st"
 msgstr "21ì"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "22nd"
 msgstr "22ì"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "23rd"
 msgstr "23ì"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "24th"
 msgstr "24ì"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "25th"
 msgstr "25ì"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "26th"
 msgstr "26ì"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "27th"
 msgstr "27ì"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "28th"
 msgstr "28ì"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "29th"
 msgstr "29ì"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "30th"
 msgstr "30ì"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "31st"
 msgstr "31ì"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Su"
 msgstr "ì"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Mo"
 msgstr "ì"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Tu"
 msgstr "í"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "We"
 msgstr "ì"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Th"
 msgstr "ë"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Fr"
 msgstr "ê"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Sa"
 msgstr "í"
 
 # FIXME - hard to translate UI + string based on English grammar
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3156
+#: ../calendar/gui/print.c:3153
 msgid " to "
 msgstr "ëí "
 
@@ -4979,21 +4910,21 @@ msgstr "ëí "
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3166
+#: ../calendar/gui/print.c:3163
 msgid " (Completed "
 msgstr " (ìëë "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3169
 msgid "Completed "
 msgstr "ìëë "
 
 # FIXME - hard to translate UI + string based on English grammar
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3182
+#: ../calendar/gui/print.c:3179
 msgid " (Due "
 msgstr " (êí "
 
@@ -5001,45 +4932,45 @@ msgstr " (êí "
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3189
+#: ../calendar/gui/print.c:3186
 msgid "Due "
 msgstr "êí "
 
-#: ../calendar/gui/print.c:3354
+#: ../calendar/gui/print.c:3351
 #, c-format
 msgid "Summary: %s"
 msgstr "ìì: %s"
 
-#: ../calendar/gui/print.c:3381
+#: ../calendar/gui/print.c:3378
 msgid "Attendees: "
 msgstr "ììì: "
 
-#: ../calendar/gui/print.c:3424
+#: ../calendar/gui/print.c:3421
 #, c-format
 msgid "Status: %s"
 msgstr "ìí: %s"
 
-#: ../calendar/gui/print.c:3439
+#: ../calendar/gui/print.c:3436
 #, c-format
 msgid "Priority: %s"
 msgstr "ìììì: %s"
 
-#: ../calendar/gui/print.c:3457
+#: ../calendar/gui/print.c:3454
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "íìí ìë: %i"
 
-#: ../calendar/gui/print.c:3468
+#: ../calendar/gui/print.c:3465
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3481
+#: ../calendar/gui/print.c:3478
 #, c-format
 msgid "Categories: %s"
 msgstr "ëë: %s"
 
-#: ../calendar/gui/print.c:3492
+#: ../calendar/gui/print.c:3489
 msgid "Contacts: "
 msgstr "ìëì:"
 
@@ -5066,189 +4997,189 @@ msgstr "ëë í"
 msgid "is less than"
 msgstr "ëë ìì"
 
-#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:83
 msgid "Appointments and Meetings"
 msgstr "ìì ë ëì"
 
-#: ../calendar/importers/icalendar-importer.c:437
-#: ../calendar/importers/icalendar-importer.c:870
-#: ../plugins/itip-formatter/itip-formatter.c:2499
+#: ../calendar/importers/icalendar-importer.c:468
+#: ../calendar/importers/icalendar-importer.c:905
+#: ../modules/itip-formatter/itip-view.c:5564
 msgid "Opening calendar"
 msgstr "ëëì ìë ììëë"
 
-#: ../calendar/importers/icalendar-importer.c:585
+#: ../calendar/importers/icalendar-importer.c:616
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar íì (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:617
 msgid "Evolution iCalendar importer"
 msgstr "ìëëì iCalendar êììê"
 
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../calendar/importers/icalendar-importer.c:676
+#: ../calendar/importers/icalendar-importer.c:707
 msgid "Reminder!"
 msgstr "ëë ìë!"
 
-#: ../calendar/importers/icalendar-importer.c:760
+#: ../calendar/importers/icalendar-importer.c:791
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar íì (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:761
+#: ../calendar/importers/icalendar-importer.c:792
 msgid "Evolution vCalendar importer"
 msgstr "ìëëì vCalendar êììê"
 
 # event -> íì, Microsoft Office XP ìê
-#: ../calendar/importers/icalendar-importer.c:1041
+#: ../calendar/importers/icalendar-importer.c:1075
 msgid "Calendar Events"
 msgstr "ëë íì"
 
-#: ../calendar/importers/icalendar-importer.c:1085
+#: ../calendar/importers/icalendar-importer.c:1119
 msgid "Evolution Calendar intelligent importer"
 msgstr "ìëëì ëë ëëí êììê"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1471
+#: ../calendar/importers/icalendar-importer.c:1187
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "ëì"
 
-#: ../calendar/importers/icalendar-importer.c:1153
-#: ../calendar/importers/icalendar-importer.c:1471
+#: ../calendar/importers/icalendar-importer.c:1187
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "íì"
 
-#: ../calendar/importers/icalendar-importer.c:1156
-#: ../calendar/importers/icalendar-importer.c:1472
+#: ../calendar/importers/icalendar-importer.c:1190
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "ìì"
 
-#: ../calendar/importers/icalendar-importer.c:1159
-#: ../calendar/importers/icalendar-importer.c:1473
+#: ../calendar/importers/icalendar-importer.c:1193
+#: ../calendar/importers/icalendar-importer.c:1507
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "ëë"
 
-#: ../calendar/importers/icalendar-importer.c:1168
+#: ../calendar/importers/icalendar-importer.c:1202
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ëë ìì"
 
-#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1207
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "ììíìì"
 
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../calendar/importers/icalendar-importer.c:1178
+#: ../calendar/importers/icalendar-importer.c:1212
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "ëë ìë ìì"
 
-#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1217
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ìë ìì"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1196
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "êê"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "êì"
 
 # ëë ìì
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1202
+#: ../calendar/importers/icalendar-importer.c:1236
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "ëë"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1240
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "ëê"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1211
-#: ../calendar/importers/icalendar-importer.c:1512
+#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1546
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "ìì"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1217
+#: ../calendar/importers/icalendar-importer.c:1251
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "ìì"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1508
+#: ../calendar/importers/icalendar-importer.c:1259
+#: ../calendar/importers/icalendar-importer.c:1542
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "ìì"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1236
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "êí"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1248
+#: ../calendar/importers/icalendar-importer.c:1282
 msgctxt "iCalImp"
 msgid "End"
 msgstr "ë"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1258
+#: ../calendar/importers/icalendar-importer.c:1292
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "ëë"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1316
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ìëë"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1290
+#: ../calendar/importers/icalendar-importer.c:1324
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1301
-#: ../calendar/importers/icalendar-importer.c:1304
+#: ../calendar/importers/icalendar-importer.c:1335
+#: ../calendar/importers/icalendar-importer.c:1338
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "ììì"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1324
-#: ../calendar/importers/icalendar-importer.c:1327
+#: ../calendar/importers/icalendar-importer.c:1358
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "ììì"
 
-#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1375
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "ìë"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1504
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "íí"
@@ -6803,319 +6734,12 @@ msgstr "ííì/ìëì"
 msgid "Pacific/Yap"
 msgstr "ííì/ì"
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:161
-msgid "ID of the socket to embed in"
-msgstr "ííí ììì ID"
-
-# option argument
-#: ../capplet/anjal-settings-main.c:162
-msgid "socket"
-msgstr "<ìì>"
-
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your full name."
-msgstr "ìì ìëì ìëíììì."
-
-#: ../capplet/settings/mail-account-view.c:78
-msgid "Please enter your email address."
-msgstr "ììëì ììë ìëíììì."
-
-#: ../capplet/settings/mail-account-view.c:79
-msgid "The email address you have entered is invalid."
-msgstr "ìëí ììëì ììê ìëëì ììëë."
-
-#: ../capplet/settings/mail-account-view.c:80
-msgid "Please enter your password."
-msgstr "ìíë ìëíììì."
-
-#: ../capplet/settings/mail-account-view.c:282
-#: ../mail/em-account-editor.c:5453 ../plugins/caldav/caldav-source.c:68
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../capplet/settings/mail-account-view.c:376
-#: ../capplet/settings/mail-account-view.c:421
-#: ../mail/em-account-editor.c:5324 ../mail/em-account-editor.c:5381
-#: ../modules/online-accounts/e-online-accounts-google.c:295
-#: ../modules/online-accounts/e-online-accounts-google.c:369
-#: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:83
-msgid "Google"
-msgstr "êê"
-
-#: ../capplet/settings/mail-account-view.c:497
-#: ../capplet/settings/mail-account-view.c:601
-#: ../mail/em-account-editor.c:4857 ../mail/em-account-editor.c:4892
-msgid "Always (SSL)"
-msgstr "íì (SSL)"
-
-#: ../capplet/settings/mail-account-view.c:500
-#: ../capplet/settings/mail-account-view.c:604
-#: ../mail/em-account-editor.c:4860 ../mail/em-account-editor.c:4895
-msgid "When possible (TLS)"
-msgstr "êëí êì (TLS)"
-
-#: ../capplet/settings/mail-account-view.c:503
-#: ../capplet/settings/mail-account-view.c:607
-#: ../mail/em-account-editor.c:1752 ../mail/em-account-editor.c:4863
-#: ../mail/em-account-editor.c:4898
-msgid "Never"
-msgstr "ìì ì í"
-
-#: ../capplet/settings/mail-account-view.c:511
-msgid "Personal details:"
-msgstr "êì ìì ìë:"
-
-#: ../capplet/settings/mail-account-view.c:518 ../mail/mail-config.ui.h:180
-msgid "Name:"
-msgstr "ìë:"
-
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:181
-msgid "Email address:"
-msgstr "ììëì ìì:"
-
-#: ../capplet/settings/mail-account-view.c:537 ../mail/mail-config.ui.h:182
-msgid "Details:"
-msgstr "ììí:"
-
-# ìì tab, ìíê ìë
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:183
-msgid "Receiving"
-msgstr "ëê"
-
-#: ../capplet/settings/mail-account-view.c:552 ../mail/mail-config.ui.h:185
-msgid "Server type:"
-msgstr "ìë ìë:"
-
-#: ../capplet/settings/mail-account-view.c:561 ../mail/mail-config.ui.h:186
-msgid "Server address:"
-msgstr "ìë ìì:"
-
-#: ../capplet/settings/mail-account-view.c:570 ../mail/mail-config.ui.h:187
-msgid "Username:"
-msgstr "ììììë:"
-
-#: ../capplet/settings/mail-account-view.c:579
-msgid "Use encryption:"
-msgstr "ìíí ìì:"
-
-# ìì tab, ìíê ìë
-#: ../capplet/settings/mail-account-view.c:612 ../mail/mail-config.ui.h:184
-msgid "Sending"
-msgstr "ëëê"
-
-#: ../capplet/settings/mail-account-view.c:655
-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:657
-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:659
-msgid "You can specify more options to configure the account."
-msgstr "êìì ììíëë ëë ììì ë ììí ì ììëë."
-
-#: ../capplet/settings/mail-account-view.c:661
-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:662
-msgid "You can specify your default settings for your account."
-msgstr "êìì ìì êëêì ììí ì ììëë."
-
-# assistantìì íì ìí
-#: ../capplet/settings/mail-account-view.c:663
-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:678
-#: ../mail/em-account-editor.c:2972 ../mail/em-account-editor.c:3111
-msgid "Identity"
-msgstr "ìì ìë"
-
-#: ../capplet/settings/mail-account-view.c:678
-msgid "Next - Receiving mail"
-msgstr "ëì - ëì ëê"
-
-#: ../capplet/settings/mail-account-view.c:679
-msgid "Receiving mail"
-msgstr "ëì ëê"
-
-#: ../capplet/settings/mail-account-view.c:679
-#: ../capplet/settings/mail-account-view.c:680
-msgid "Next - Sending mail"
-msgstr "ëì - ëì ëëê"
-
-#: ../capplet/settings/mail-account-view.c:679
-msgid "Back - Identity"
-msgstr "ëë - ìì"
-
-#: ../capplet/settings/mail-account-view.c:679
-msgid "Next - Receiving options"
-msgstr "ëì - ëê ìì"
-
-#: ../capplet/settings/mail-account-view.c:680
-msgid "Receiving options"
-msgstr "ëê ìì"
-
-#: ../capplet/settings/mail-account-view.c:680
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Back - Receiving mail"
-msgstr "ëë - ëì ëê"
-
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Sending mail"
-msgstr "ëì ëëê"
-
-#: ../capplet/settings/mail-account-view.c:682
-#: ../capplet/settings/mail-account-view.c:683
-msgid "Next - Review account"
-msgstr "ëì - êì ìë êí"
-
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Next - Defaults"
-msgstr "ëë - êëê"
-
-#: ../capplet/settings/mail-account-view.c:682
-msgid "Back - Receiving options"
-msgstr "ëë - ëê ìì"
-
-#: ../capplet/settings/mail-account-view.c:683
-#: ../mail/em-account-editor.c:4124
-msgid "Defaults"
-msgstr "êëê"
-
-#: ../capplet/settings/mail-account-view.c:683
-msgid "Back - Sending mail"
-msgstr "ëë - ëì ëëê"
-
-#: ../capplet/settings/mail-account-view.c:685
-msgid "Review account"
-msgstr "êì ìë êí"
-
-#: ../capplet/settings/mail-account-view.c:685
-msgid "Finish"
-msgstr "ëìê"
-
-#: ../capplet/settings/mail-account-view.c:685
-msgid "Back - Sending"
-msgstr "ëë - ëëê"
-
-#: ../capplet/settings/mail-account-view.c:855
-msgid "Setup Google contacts with Evolution"
-msgstr "êê ìëìë ìëëììì ììíëë."
-
-#: ../capplet/settings/mail-account-view.c:856
-msgid "Setup Google calendar with Evolution"
-msgstr "êê ëëì ìëëììì ììíëë."
-
-#: ../capplet/settings/mail-account-view.c:861
-#: ../mail/em-account-editor.c:4952
-msgid "You may need to enable IMAP access."
-msgstr "IMAP ìêì ììíì í ìë ììëë."
-
-#: ../capplet/settings/mail-account-view.c:869
-#: ../mail/em-account-editor.c:4929
-msgid "Google account settings:"
-msgstr "êê êì ìì:"
-
-#: ../capplet/settings/mail-account-view.c:895
-msgid "Setup Yahoo calendar with Evolution"
-msgstr "ìí ëëì ìëëììì ììíëë"
-
-#: ../capplet/settings/mail-account-view.c:899
-#: ../mail/em-account-editor.c:4999
-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:908
-#: ../mail/em-account-editor.c:4984
-msgid "Yahoo account settings:"
-msgstr "ìí êì ìì:"
-
-#: ../capplet/settings/mail-account-view.c:922
-msgid "Yahoo Calendar name:"
-msgstr "ìí ëë ìë:"
-
-#: ../capplet/settings/mail-account-view.c:1119
-msgid "Password:"
-msgstr "ìí:"
-
-#: ../capplet/settings/mail-account-view.c:1173
-#: ../capplet/settings/mail-settings-view.c:262
-msgid "Close Tab"
-msgstr "í ëê"
-
-#: ../capplet/settings/mail-account-view.c:1185
-msgid "Account Wizard"
-msgstr "êì ëëì"
-
-#: ../capplet/settings/mail-capplet-shell.c:212
-msgid "Evolution account assistant"
-msgstr "ìëëì êì ëìë"
-
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:377
-#: ../libemail-engine/e-mail-session.c:536
-#: ../modules/addressbook/e-book-shell-backend.c:106
-#: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:119
-#: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:108
-#: ../modules/calendar/e-task-shell-migrate.c:121
-msgid "On This Computer"
-msgstr "ì ìíí"
-
-#: ../capplet/settings/mail-settings-view.c:152
-#, c-format
-msgid "Modify %s..."
-msgstr "%s ìì..."
-
-#: ../capplet/settings/mail-settings-view.c:154
-msgid "Add a new account"
-msgstr "ì êì ìê"
-
-#: ../capplet/settings/mail-settings-view.c:194
-msgid "Account management"
-msgstr "êì êë"
-
-#: ../capplet/settings/mail-settings-view.c:274
-msgid "Settings"
-msgstr "ìì"
-
 #: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "ëë ìëìë ìì..."
 
 #: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-signature-editor.c:211
+#: ../widgets/misc/e-mail-signature-editor.c:285
 msgid "_Close"
 msgstr "ëê(_C)"
 
@@ -7131,7 +6755,7 @@ msgstr "ì ëìì(_M)"
 msgid "Open New Message window"
 msgstr "ì ëìì ìì ìëë"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1523
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
 msgid "Configure Evolution"
 msgstr "ìëëì ìì"
 
@@ -7167,7 +6791,7 @@ msgstr "ìì ëêíì ìì(_D)"
 msgid "Save as draft"
 msgstr "ìì ëêíì ìì"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:317
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:325
 msgid "S_end"
 msgstr "ëëê(_E)"
 
@@ -7260,15 +6884,15 @@ msgstr "íì ìì íëì íìíì íêíëë"
 msgid "Save Draft"
 msgstr "ìì ìì"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the recipients of the message"
 msgstr "ëììë ëì ìëì ìëíììì"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:45
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "ëììì ìëì ëì ìëì ììë ìëíììì"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:48
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -7276,69 +6900,53 @@ msgstr ""
 "ëììì ëë ìë ëëì ëíëì ìê ìì ëììë ëì ììë ìëíìì"
 "ì."
 
-#: ../composer/e-composer-header-table.c:779
+#: ../composer/e-composer-header-table.c:849
 msgid "Fr_om:"
 msgstr "ëë ìë(_O):"
 
-#: ../composer/e-composer-header-table.c:788
+#: ../composer/e-composer-header-table.c:856
 msgid "_Reply-To:"
 msgstr "íì ìì(_R):"
 
-#: ../composer/e-composer-header-table.c:792
+#: ../composer/e-composer-header-table.c:861
 msgid "_To:"
 msgstr "ëë ìë(_T):"
 
-#: ../composer/e-composer-header-table.c:797
+#: ../composer/e-composer-header-table.c:867
 msgid "_Cc:"
 msgstr "ìì(_C):"
 
-#: ../composer/e-composer-header-table.c:802
+#: ../composer/e-composer-header-table.c:873
 msgid "_Bcc:"
 msgstr "ìì ìì(_B):"
 
 # post -> êì, Microsoft Office XP ìê
-#: ../composer/e-composer-header-table.c:807
+#: ../composer/e-composer-header-table.c:878
 msgid "_Post To:"
 msgstr "êì ìì(_P):"
 
-#: ../composer/e-composer-header-table.c:811
+#: ../composer/e-composer-header-table.c:882
 msgid "S_ubject:"
 msgstr "ìë(_U):"
 
-#: ../composer/e-composer-header-table.c:820
+#: ../composer/e-composer-header-table.c:890
+#: ../mail/e-mail-config-identity-page.c:466
 msgid "Si_gnature:"
 msgstr "ìë(_G):"
 
-#: ../composer/e-composer-name-header.c:145
+#: ../composer/e-composer-name-header.c:215
 msgid "Click here for the address book"
 msgstr "ììëì ëëë ëëììì"
 
-#: ../composer/e-composer-post-header.c:135
+#: ../composer/e-composer-post-header.c:184
 msgid "Click here to select folders to post to"
 msgstr "êìí íëë êëëë ìêë ëëììì"
 
-# tooltip
-#: ../composer/e-composer-private.c:215
-msgid "Undo the last action"
-msgstr "ëìë ëìì ìí ììíëë"
-
-#: ../composer/e-composer-private.c:219
-msgid "Redo the last undone action"
-msgstr "ëìë ìí ììí ëìì ëì ìííëë"
-
-#: ../composer/e-composer-private.c:223
-msgid "Search for text"
-msgstr "íìí êì"
-
-#: ../composer/e-composer-private.c:227
-msgid "Search for and replace text"
-msgstr "íìí êì ë ëêê"
-
-#: ../composer/e-composer-private.c:337
+#: ../composer/e-composer-private.c:345
 msgid "Save draft"
 msgstr "ìì ìì"
 
-#: ../composer/e-msg-composer.c:813
+#: ../composer/e-msg-composer.c:856
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7346,7 +6954,7 @@ msgstr ""
 "ëëë ëììì ìëí ì ììëë: êìì ììí ë ì ìììë ììíì ì"
 "ììëë"
 
-#: ../composer/e-msg-composer.c:822
+#: ../composer/e-msg-composer.c:865
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7355,17 +6963,17 @@ msgstr ""
 "ëëë ëììë ìííí ì ììëë: êììì ìíí ìììë ììíì ìì"
 "ìëë"
 
-#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
+#: ../composer/e-msg-composer.c:1545 ../composer/e-msg-composer.c:1954
 msgid "Compose Message"
 msgstr "ëììë ììíëë"
 
-#: ../composer/e-msg-composer.c:4163
+#: ../composer/e-msg-composer.c:4198
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "ëì ììì íìíê ìë ëìì ëëì ëì ììëë. ì ëìì ëëì íì"
 "í ì ììëë."
 
-#: ../composer/e-msg-composer.c:4867
+#: ../composer/e-msg-composer.c:4875
 msgid "Untitled Message"
 msgstr "ìë ìë ëìì"
 
@@ -7494,7 +7102,7 @@ msgstr ""
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "ëëë ìì ìëê ëìíìëë. ìëê êì íìêìëê?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:152
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "íìë ìëë &quot;{0}&quot;ìëë."
 
@@ -7531,13 +7139,13 @@ msgstr "ìëëì ìë"
 msgid "Calendar event notifications"
 msgstr "ëë íì ìë"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:941
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:936
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "ìëëì"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:651
 msgid "Groupware Suite"
 msgstr "êëìì ëì"
 
@@ -7558,7 +7166,6 @@ msgid "Configure email accounts"
 msgstr "ììëì êì ìì"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
 msgid "Enable address formatting"
 msgstr "ìì íì ëìê ìì"
 
@@ -7569,78 +7176,62 @@ msgid ""
 msgstr "ììë íëíë êêì íìì ëê íìì ëìì ìë"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
 msgid "Autocomplete length"
 msgstr "ìë ìì êì"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "ìëëììì ìë ììì ììíëë ìëíì í ëì êì."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show autocompleted name with an address"
 msgstr "ììë ìëì ìë ììíì íì"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr "ëì ììë ìë ììí ìëê êì ìëìì íìíì ìë."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "ìë ìí ëí ììì ëìëìë ììëìë íëì URI"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "ìë ìí ëí ììì ëìëìë ììëìë íëì URI."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Contact layout style"
 msgstr "ìëì íë ëì"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
 "contact list. \"1\" (Vertical View) places the preview pane next to the "
 "contact list."
-msgstr ""
-"ëë ëê ìì ìëì ëë ììì ëêíì ìëì ë ì êìíë ëì ëì. "
-"\"0\"ì (ìíì ëì) ëë ëê ìì ìëì ëë ìëì ëëë. \"1\"ì (ì"
-"ë ëê) ëë ëê ìì ìëì ëë ìì ëëí ëëë."
+msgstr "ëë ëê ìì ìëì ëë ììì ëêíì ìëì ë ì êìíë ëì ëì. \"0\"ì(ìíì ëì) ëë ëê ìì ìëì ëë ìëì ëëë. \"1\"ì(ìë ëê) ëë ëê ìì ìëì ëë ìì ëëí ëëë."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "Contact preview pane position (horizontal)"
-msgstr "ìëì ëë ëê ì ìì (êë)"
+msgstr "ìëì ëë ëê ì ìì(êë)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr "êë ëíì ë ìëì ëë ëê ìì ìì."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "Contact preview pane position (vertical)"
-msgstr "ìëì ëë ëê ì ìì (ìë)"
+msgstr "ìëì ëë ëê ì ìì(ìë)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Position of the contact preview pane when oriented vertically."
 msgstr "ìë ëíì ë ìëì ëë ëê ìì ìì."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
 msgid "Show maps"
 msgstr "ìë ëê"
 
@@ -7649,7 +7240,6 @@ msgid "Whether to show maps in preview pane"
 msgstr "ëë ëê ìì ìëë íìíì ìë"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Primary address book"
 msgstr "ìì ììë"
 
@@ -7657,25 +7247,21 @@ msgstr "ìì ììë"
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view"
-msgstr "êììë ì \"ìëì\" ëìì, ìíí (ëë \"ìì\") ììëì UID"
+msgstr "êììë ì \"ìëì\" ëìì, ìíí(ëë \"ìì\") ììëì UID"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "Show preview pane"
 msgstr "ëë ëê ì ëê"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "ëë ëê ìì ëì ìë."
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "ëìì íìíë ìëìëë ëí"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-#: ../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."
@@ -7685,19 +7271,16 @@ msgstr ""
 
 # Reminder -> ëë ìë, Microsoft Office XP
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
 msgid "Save directory for reminder audio"
 msgstr "ëë ìë ìëì ìì ëëíë"
 
 # Reminder -> ëë ìë, Microsoft Office XP
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
 msgid "Directory for saving reminder audio files"
 msgstr "ëë ìë ìëì íìì ììí ëëíë"
 
 # Reminder -> ëë ìë, Microsoft Office XP
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
 msgid "Birthday and anniversary reminder value"
 msgstr "ìì ë êëì ìë ê"
 
@@ -7708,7 +7291,6 @@ msgstr "ìì ë êëì ìëì êìí ëìì ì"
 
 # Reminder -> ëë ìë, Microsoft Office XP
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
 msgid "Birthday and anniversary reminder units"
 msgstr "ìì ë êëì ìë ìë"
 
@@ -7720,7 +7302,6 @@ msgid ""
 msgstr "ëì ë êëì ëë ìëì ëì, \"minutes\", \"hours\", \"days\""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
 msgid "Compress weekends in month view"
 msgstr "í ëì ë ë íìì/ìììì í ìì íì"
 
@@ -7731,7 +7312,6 @@ msgid ""
 msgstr "í ëì ë ë ìëì ììíì íìì/ìììì í ìì íìíì ìë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "Ask for confirmation when deleting items"
 msgstr "íëì ìì ë íì ìëíê"
 
@@ -7740,7 +7320,6 @@ msgid "Whether to ask for confirmation when deleting an appointment or task"
 msgstr "ìììë ììì ìì ë íì ìëì íì ìë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
 msgid "Confirm expunge"
 msgstr "íë ëì ë íì ìë"
 
@@ -7749,7 +7328,6 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks"
 msgstr "ìì ìììë ììì ëì ë íì ìëì íì ìë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Month view vertical pane position"
 msgstr "í ëì ëê ìë ì ìì"
 
@@ -7760,7 +7338,6 @@ msgid ""
 msgstr "ìë ìì ìì, ìë ëëê ëì ììëê ëë ìì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Workday end hour"
 msgstr "êëìì ëëë ìê"
 
@@ -7769,37 +7346,30 @@ msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
 msgstr "êëìì ëëë ìê, 24ìê íììë 0ìì 23êì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Workday end minute"
 msgstr "êëìì ëëë ë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "êëìì ëëë ë, 0ìì 59êì."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
 msgid "Workday start hour"
 msgstr "êëìì ììíë ìê"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "êëìì ììíë ìê, 24ìê íììë 0ìì 23êì."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "Workday start minute"
 msgstr "êëìì ììíë ë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "êëìì ììíë ë, 0ìì 59êì."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "The second timezone for a Day View"
 msgstr "ìë ëêìì ëì íì ìêë."
 
@@ -7807,10 +7377,11 @@ msgstr "ìë ëêìì ëì íì ìêë."
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key"
-msgstr "ëì íì ìêëê ììë, ìë ëêìì ëì íì ìêëë íìíëë. êì 'timezone' íìì ììí êê ëìíëë"
+msgstr ""
+"ëì íì ìêëê ììë, ìë ëêìì ëì íì ìêëë íìíëë. êì "
+"'timezone' íìì ììí êê ëìíëë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid "Recently used second time zones in a Day View"
 msgstr "ìë ëêìì ìêì ììí ëì íì ìêë."
 
@@ -7830,7 +7401,6 @@ msgstr "'day-second-zones' ëëì ììí ìêì ììí íì ìê
 
 # Reminder -> ëë ìë, Microsoft Office XP
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
 msgid "Default reminder value"
 msgstr "êë ëë ìë ê"
 
@@ -7841,7 +7411,6 @@ msgstr "êë ëë ìë ìëë êìí ëìì ì"
 
 # Reminder -> ëë ìë, Microsoft Office XP
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
 msgid "Default reminder units"
 msgstr "êë ëë ìë ëì"
 
@@ -7851,67 +7420,54 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "êë ëë ìëì ëì, \"minutes\", \"hours\" íì \"days\""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "íì/ìì/ëì íììì ëë íë íì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "íì/ëì íììì ëë íë íì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "íì/ìì/ëì íììì ìí íë íì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "íì/ìì/ëì íììì ìí íë íì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "íì/ìì/ëì íììì ìëìì íë íì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "íì/ìì/ëì íììì ìëìì íë íì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
 msgid "Show status field in the event/task/meeting editor"
 msgstr "íì/ìì/ëì íììì ìí íë íì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "íì/ìì/ëì íììì ìí íë íì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Show timezone field in the event/meeting editor"
 msgstr "íì/ëì íììì íì ìêë íëì íìíëë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "íì/ëì íììì íì ìêë íë íì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Show type field in the event/task/meeting editor"
 msgstr "íì/ìì/ëì íììì ìë íëì íìíëë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "íì/ìì/ëì íììì ìë íë íì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
 msgid "Hide completed tasks"
 msgstr "ëëì ìì ìêê"
 
@@ -7920,7 +7476,6 @@ msgid "Whether to hide completed tasks in the tasks view"
 msgstr "ëëì ììì ìì íìí ë êìì ìë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
 msgid "Hide task units"
 msgstr "ìì ëì ìêê"
 
@@ -7930,7 +7485,6 @@ msgid ""
 msgstr "ììì ìì ìêì êìíë ëì, \"minutes\", \"hours\" íì \"days\""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
 msgid "Hide task value"
 msgstr "ìì ê ìêê"
 
@@ -7939,7 +7493,6 @@ msgid "Number of units for determining when to hide tasks"
 msgstr "ìì ììì êì ì êìí ëìì ì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Horizontal pane position"
 msgstr "êë ì ìì"
 
@@ -7947,11 +7500,12 @@ msgstr "êë ì ìì"
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
-msgstr "êë ìì ìì, í ëì ëêê ìë ë ëì ìí ëëê ìì ëë ìì, íì ëì"
+msgstr ""
+"êë ìì ìì, í ëì ëêê ìë ë ëì ìí ëëê ìì ëë ìì, íì "
+"ëì"
 
 # Reminder -> ëë ìë, Microsoft Office XP
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
 msgid "Last reminder time"
 msgstr "ëìë ëë ìë ìê"
 
@@ -7960,7 +7514,6 @@ msgid "Time the last reminder ran, in time_t"
 msgstr "ìêì ëë ìëì ìëí ìê, time_t ëì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
 msgid "Marcus Bains Line Color - Day View"
 msgstr "ëìì ëì ëì ì - ëìë ëê"
 
@@ -7969,35 +7522,31 @@ msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "íëì ë ë ëìì ëìì ëìì êë ì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "ëìì ëì ëì ì - ìê ëë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
-msgstr "ìê ëëì ëìì ëìì ëìì êë ì (êëêì ëì ìì)"
+msgstr "ìê ëëì ëìì ëìì ëìì êë ì(êëêì ëì ìì)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
 msgid "Marcus Bains Line"
 msgstr "ëìì ëì ëì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
-msgstr "ëëì ëìì ëìì ëìì (íë íì ìêëì ìì) êëì ìë"
+msgstr "ëëì ëìì ëìì ëìì(íë íì ìêëì ìì) êëì ìë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Memo preview pane position (horizontal)"
-msgstr "ëë ëë ëê ì ìì (êë)"
+msgstr "ëë ëë ëê ì ìì(êë)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "êë ëíì ë ìì ëë ëê ìì ìì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Memo layout style"
 msgstr "ëë íë ëì"
 
@@ -8006,22 +7555,17 @@ msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list"
-msgstr ""
-"ëë ëê ìì ëë ëë ììì ëêíì ìëì ë ì êìíë ëì ëì. "
-"\"0\"ì (ìíì ëì) ëë ëê ìì ëë ëë ìëì ëëë. \"1\"ì (ìë "
-"ëê) ëë ëê ìì ëë ëë ìì ëëí ëëë."
+msgstr "ëë ëê ìì ëë ëë ììì ëêíì ìëì ë ì êìíë ëì ëì. \"0\"ì(ìíì ëì) ëë ëê ìì ëë ëë ìëì ëëë. \"1\"ì(ìë ëê) ëë ëê ìì ëë ëë ìì ëëí ëëë."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid "Memo preview pane position (vertical)"
-msgstr "ëë ëë ëê ì ìì (ìë)"
+msgstr "ëë ëë ëê ì ìì(ìë)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "ìë ëíì ë ëë ëë ëê ìì ìì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "í ëì ëê êë ì ìì"
 
@@ -8029,7 +7573,9 @@ msgstr "í ëì ëê êë ì ìì"
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
-msgstr "êë ìì ìì, í ëì ëêìì ëì ëì ìí ëëê ìì ëë ìì, íì ëì"
+msgstr ""
+"êë ìì ìì, í ëì ëêìì ëì ëì ìí ëëê ìì ëë ìì, íì "
+"ëì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 msgid "Scroll Month View by a week, not by a month"
@@ -8041,7 +7587,6 @@ msgstr "í ë ëìê ìëë í ì ëìë ëë ëêë ìíë
 
 # Reminder -> ëë ìë, Microsoft Office XP
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
 msgid "Reminder programs"
 msgstr "ëë ìë íëêë"
 
@@ -8052,7 +7597,6 @@ msgstr "ëë ìëìì ìíí ì ìë íëêë ëë"
 
 # Reminder -> ëë ìë, Microsoft Office XP
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Show display reminders in notification tray"
 msgstr "ìë ìììì ëë ìë íì"
 
@@ -8070,7 +7614,6 @@ msgid "Name of the preferred New toolbar button item"
 msgstr "ìëì ëê ëì ëì íëìë ìíë ìë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Primary calendar"
 msgstr "ìì ëë"
 
@@ -8078,10 +7621,9 @@ msgstr "ìì ëë"
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
-msgstr "êììë ì \"ëë\" ëìì, ìíí (ëë \"ìì\") ëëì UID"
+msgstr "êììë ì \"ëë\" ëìì, ìíí(ëë \"ìì\") ëëì UID"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
 msgid "Primary memo list"
 msgstr "ìì ëë ëë"
 
@@ -8089,10 +7631,9 @@ msgstr "ìì ëë ëë"
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
-msgstr "êììë ì \"ëë\" ëìì, ìíí (ëë \"ìì\") ëë ëëì UID"
+msgstr "êììë ì \"ëë\" ëìì, ìíí(ëë \"ìì\") ëë ëëì UID"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Primary task list"
 msgstr "ìì ìì ëë"
 
@@ -8100,11 +7641,10 @@ msgstr "ìì ìì ëë"
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
-msgstr "êììë ì \"ìì\" ëìì, ìíí (ëë \"ìì\") ìì ëëì UID"
+msgstr "êììë ì \"ìì\" ëìì, ìíí(ëë \"ìì\") ìì ëëì UID"
 
 # free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
 msgid "Free/busy template URL"
 msgstr "ìì ìì/ìì ìì URL"
 
@@ -8114,10 +7654,11 @@ msgstr "ìì ìì/ìì ìì URL"
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain"
-msgstr "ìì ìì/ìì ëìí ëìíìë ììí URL ìì, %uì(ë) ììëì ììì ììì ëë, %dì(ë) ëëììë ëëëë"
+msgstr ""
+"ìì ìì/ìì ëìí ëìíìë ììí URL ìì, %uì(ë) ììëì ììì ì"
+"ìì ëë, %dì(ë) ëëììë ëëëë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
 msgid "Recurrent Events in Italic"
 msgstr "ëëíë íìë êììì êìë"
 
@@ -8126,153 +7667,130 @@ msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr "ìì íëì ëëìì ëë íìê ìë ëì êììì êêë íìíëë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
-msgid "List of selected calendars"
-msgstr "ìíí ëë ëë"
+msgid "Search range for time-based searching in years"
+msgstr "ìê êë êìì ììí êì ëì, ì ëì"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-msgid "List of calendars to load"
-msgstr "ììëì ëë ëë"
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr "ìê ëì êìì í ë, ë êìíê ìì ë íì ìíí ëììì ììí ìëëí ììë ëë ìëíëë. êëêì 10ëìëë"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid "List of selected memo lists"
-msgstr "ìíí ëë ëëì ëë"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-msgid "List of memo lists to load"
-msgstr "ììëì ëë ëëì ëë"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-msgid "List of selected task lists"
-msgstr "ìíí ìì ëëì ëë"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-msgid "List of task lists to load"
-msgstr "ììëì ìì ëëì ëë"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Show appointment end times in week and month views"
 msgstr "í ìì ëêë í ëì ë ë ìì ëëë ìê íì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "í ìì ëêë í ëì ë ë íì ëëë ìê íìíì ìë"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show the memo preview pane"
 msgstr "ëë ëë ëê ì íì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "ììë ëì ìì ëë ëë ëê ìì íì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Show the task preview pane"
 msgstr "ìì ëë ëê ì íì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "ììë ëì ìì ìì ëë ëê ìì íì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "ìë ëê, êëì ìë ëê, ëì ìí ëëìì ë ëì ììì íì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "ëëì ìëêì ëëìì ë ëì ììì íìíì ìë"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Vertical position for the tag pane"
 msgstr "íê ìì ìë ìì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "Highlight tasks due today"
 msgstr "ìë ëêì ìì êì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
-msgstr "ìë ëêì ììì íëí ììë (task-due-today-color) êìíì ìë"
+msgstr "ìë ëêì ììì íëí ììë(task-due-today-color) êìíì ìë"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "Tasks due today color"
 msgstr "ìë ëêì ììì ì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
-msgstr "ìë ëêì ììì ëêì (\"#rrggbb\" íì), task-due-today-highlightì íê ìì"
+msgstr ""
+"ìë ëêì ììì ëêì (\"#rrggbb\" íì), task-due-today-highlightì í"
+"ê ìì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Task preview pane position (horizontal)"
-msgstr "ìì ëë ëê ì ìì (êë)"
+msgstr "ìì ëë ëê ì ìì(êë)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Task layout style"
 msgstr "ìì íë ëì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list"
-msgstr ""
-"ëë ëê ìì ìì ëë ììì ëêíì ìëì ë ì êìíë ëì ëì. "
-"\"0\"ì (ìíì ëì) ëë ëê ìì ìì ëë ìëì ëëë. \"1\"ì (ìë "
-"ëê) ëë ëê ìì ìì ëë ìì ëëí ëëë."
+msgstr "ëë ëê ìì ìì ëë ììì ëêíì ìëì ë ì êìíë ëì ëì. \"0\"ì(ìíì ëì) ëë ëê ìì ìì ëë ìëì ëëë. \"1\"ì(ìë ëê) ëë ëê ìì ìì ëë ìì ëëí ëëë."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Task preview pane position (vertical)"
-msgstr "ìì ëë ëê ì ìì (ìë)"
+msgstr "ìì ëë ëê ì ìì(ìë)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "ìë ëíì ë ìì ëë ëê ìì ìì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "Highlight overdue tasks"
 msgstr "ëêì ìë ìì êì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
-msgstr "ëêì ìë ììì íëí ììë (task-overdue-color) êìíì ìë"
+msgstr "ëêì ìë ììì íëí ììë(task-overdue-color) êìíì ìë"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Overdue tasks color"
 msgstr "ëêì ìë ìì ì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
-msgstr "ëêì ìë ììì ëêì (\"#rrggbb\" íì), task-overdue-highlightì íê ìì."
+msgstr ""
+"ëêì ìë ììì ëêì (\"#rrggbb\" íì), task-overdue-highlightì íê "
+"ìì."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "Time divisions"
 msgstr "ìê êê"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Intervals shown in Day and Work Week views, in minutes"
-msgstr "ìë ëê ë êëì ìë ëêì ëì ìê êê (ë ëì)"
+msgstr "ìë ëê ë êëì ìë ëêì ëì ìê êê(ë ëì)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "Timezone"
 msgstr "íì ìêë "
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8280,116 +7798,94 @@ msgstr ""
 "ëëì ëìì ìêì ììí êë íì ìêë, Olsen íì ìêë ëìíëìì"
 "ì ëëì. (ëìíì ìê \"America/New York\"ì êì ìëë.)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Twenty four hour time format"
 msgstr "24ìê íì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "ìêì ìì/ìíê ìë 24ìê ëëë íìíì ìë"
 
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Birthday and anniversary reminder"
 msgstr "ìì ë êëì ìë"
 
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "ëì ë êëì ëë ìë êëêì ììíì ìë"
 
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Default appointment reminder"
 msgstr "êë ìì ëë ìë"
 
 # Reminder -> ëë ìë, Microsoft Office XP
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid "Whether to set a default reminder for appointments"
 msgstr "ììì ëë ìë êëêì ììíì ìë"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Use system timezone"
 msgstr "ììí íì ìêë ìì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "ìëëììì ìíí íì ìêëê ìëë ììí íì ìêëë ìì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Week start"
 msgstr "ìì ìì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgstr "í ìê ììíë ìì, ììì(0)ìì íìì(6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Work days"
 msgstr "êë ìì"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Days on which the start and end of work hours should be indicated"
 msgstr "êë ìì/ë ìêì ììí ë"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Configuration version"
-msgstr "ìì ëì"
+msgid "Previous Evolution version"
+msgstr "ìì ìëëì ëì"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr ""
-"ìëëìì ìì ëì, major/minor/configuration ëê. (ìë ëì \"2.6.0\")"
+"The most recently used version of Evolution, expressed as \"major.minor.micro"
+"\". This is used for data and settings migration from older to newer "
+"versions."
+msgstr "êì ìêì ììí ìëëì ëì, \"ëìì.ëìë.ëìíë\" ëì íì. ì êì ëìíì ììì êëììì ìëììë ìê ë ììíëë."
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Last upgraded configuration version"
-msgstr "ìê ìêëìëí ìì ëì"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"ìê ìêëìëí ìëëìì ìì ëì, major/minor/configuration ëê. (ì"
-"ë ëì \"2.6.0\")"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "List of disabled plugins"
 msgstr "ììíì ìë íëêì ëë"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
 msgid "The list of disabled plugins in Evolution"
 msgstr "ìëëìì ììíì ìë íëêìì ëë"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "The window's X coordinate"
 msgstr "ìì êë ìí"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
 msgid "The window's Y coordinate"
 msgstr "ìì ìë ìí"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
 msgid "The window's width in pixels"
 msgstr "ìì ëë, íì ëì"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
 msgid "The window's height in pixels"
 msgstr "ìì ëì, íì ëì"
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
 msgid "Whether the window is maximized"
 msgstr "ìì ìëííì ìë"
 
@@ -8410,28 +7906,23 @@ msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgstr "êë ëëìì ììì êììëì ìë"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "ìëëìì êë ëì íëêëìì êì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "ìëëìì ììí ëëë, êë ëì íëêëìì ìëë êìíëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Default charset in which to compose messages"
 msgstr "ëììë ììí êë ëìì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-#: ../mail/evolution-mail.schemas.in.h:2
 msgid "Default charset in which to compose messages."
 msgstr "ëììë ììí êë ëìì."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Path where picture gallery should search for its content"
 msgstr "ìì êëëê êë íìì ìì êë"
 
@@ -8441,35 +7932,29 @@ 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 "ë ëììë ììíë ììíì ìì íëë ìì (ëí ~/ìì íë), ììí êëê ìë êììë ì íëë ìì"
+msgstr "ë ëììë ììíë ììíì ìì íëë ìì(ëí ~/ìì íë), ììí êëê ìë êììë ì íëë ìì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#: ../mail/evolution-mail.schemas.in.h:3
 msgid "Spell check inline"
 msgstr "ëì ëìë êì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Draw spelling error indicators on words as you type."
 msgstr "íìíí ë ëìëì íë ëìì íìí ìëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Automatic link recognition"
 msgstr "ëí ìë ìì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Recognize links in text and replace them."
 msgstr "íìíì ëì ìë ëíë ììíê ëêëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "ìëíì ìë ìì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "íìí ìëìëë ììíê êëìë ëêëë."
 
@@ -8491,7 +7976,8 @@ msgstr "ìë ëìì"
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
-msgstr "ëììë ìëí ë, ëì ëìì ìëí ëììëë ììì ìëíë íìí"
+msgstr ""
+"ëììë ìëí ë, ëì ëìì ìëí ëììëë ììì ìëíë íìí"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Original message"
@@ -8501,15 +7987,13 @@ msgstr "ìë ëìì"
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
-msgstr "ëììì íìí ë (ìì ëì ëìì ì êì), ëì ëìì ìë ëììëë ììì ìëíë íìí"
+msgstr "ëììì íìí ë(ìì ëì ëìì ì êì), ëì ëìì ìë ëììëë ììì ìëíë íìí"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Group Reply replies to list"
 msgstr "êë íìì ììíë ëìíë íìíëë"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-#: ../mail/evolution-mail.schemas.in.h:10
 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 "
@@ -8520,12 +8004,10 @@ msgstr ""
 "ì ëìë ììíì ë ìë ëìì íë ëìë ëìíìë ëìíëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Put the cursor at the bottom of replies"
 msgstr "ììë íì ë ìëì ëìëë"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-#: ../mail/evolution-mail.schemas.in.h:14
 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 "
@@ -8536,52 +8018,42 @@ msgstr ""
 
 # read receipt -> ëì ìì íì, Microsoft Office XP ìê
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Always request read receipt"
 msgstr "íì ëì ìì íì ìì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "êëêìë ëì ìì íì ììì ëë ëììì ìêíì ìë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Send HTML mail by default"
 msgstr "êëìë HTML ëì ëëê"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Send HTML mail by default."
 msgstr "êëìë HTML ëìì ëëëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Spell checking color"
 msgstr "ëìë êì ì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ëì ëìë êìë ììí ë ëìëì íë ëìì ëì êì ì."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Spell checking languages"
 msgstr "ëìë êì ìì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:22
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ëìë êìì ììí ììì ìì ìë ëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "ëì ëììë ëë ë \"ìì ìì\" íë íì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8590,12 +8062,10 @@ msgstr ""
 "ìì ë ëê ëëìì ìííëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "ëì ëììë ëë ë \"ìì\" íë íì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:26
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8604,12 +8074,10 @@ msgstr ""
 "ë ëê ëëìì ìííëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "ëì ëììë ëë ë \"íì ìì\" íë íì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8618,12 +8086,10 @@ msgstr ""
 "ìì ë ëê ëëìì ìííëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "ëìêëì êì ì ë \"ëë ìë\" íë íì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#: ../mail/evolution-mail.schemas.in.h:30
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8632,12 +8098,10 @@ msgstr ""
 "ìì ë ëê ëëìì ìííëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "ëìêëì êì ì ë \"íì ìì\" íë íì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#: ../mail/evolution-mail.schemas.in.h:32
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8650,19 +8114,17 @@ msgid "Digitally sign replies when the original message is signed"
 msgstr "ìëì ìëëì ììë ëìë ëìí ìëíê"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#: ../mail/evolution-mail.schemas.in.h:12
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
-msgstr "PGPë S/MIME ìëë ëììì íìí ë ìëìë PGPë S/MIME ìë ìì."
+msgstr ""
+"PGPë S/MIME ìëë ëììì íìí ë ìëìë PGPë S/MIME ìë ìì."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "íì ìëì ììë/ìëì ëììë ììë"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8675,12 +8137,10 @@ msgstr ""
 "RFC 2047 íìì ììíê ììëë."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Put personalized signatures at the top of replies"
 msgstr "íì ë ìì êì ìëì ëìëë"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#: ../mail/evolution-mail.schemas.in.h:36
 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 "
@@ -8691,25 +8151,21 @@ msgstr ""
 
 # ëìì ìë ìì ëì ìë '--' ëì
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Do not add signature delimiter"
 msgstr "ìë êë ëìë ìêíì ìê"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr "ììë ëìì ììí ë ìë ìì êëíë ëìë ìêíì ììëë."
 
-# Reply-To: íëë ëíëë
+# Reply-To: íëë ëíëë. ìëìë ëë íì ìì.
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Ignore list Reply-To:"
 msgstr "ëìí Reply-To: ëì"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#: ../mail/evolution-mail.schemas.in.h:44
 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. "
@@ -8735,15 +8191,33 @@ msgid ""
 "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard \"Re\" "
 "prefix. An example is 'SV,AV'."
-msgstr "ììíë 'Re' ììì ëëìë, ëììì ëìí ë ìëì ëì ììë ëìíëë. êë \"Re\" ìëìì ìêí ìí. ìë ëì, 'SV,AV'."
+msgstr ""
+"ììíë 'Re' ììì ëëìë, ëììì ëìí ë ìëì ëì ììë ëìíë"
+"ë. êë \"Re\" ìëìì ìêí ìí. ìë ëì, 'SV,AV'."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Save file format for drag-and-drop operation"
+msgstr "ëìëê ììì ììí íì ìì íë"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid "Can be either 'mbox' or 'pdf'."
+msgstr "'mbox' ëë 'pdf'ê êë."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Save name format for drag-and-drop operation"
+msgstr "ëìëê ììì ììí íì ìë íë"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid ""
+"Can be either 2 to use current date and time or any other value for sent "
+"date of the message. This has a meaning only when dropping just one message."
+msgstr "êì 2ìë íì ëìì ìêìê, êí ëìì ëë ìê êì ë ìë ììëë. ì êì í êì ëììë ëì ëìì êììë ìëê ììëë."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Show image animations"
 msgstr "êë ìëëìì ëê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8751,35 +8225,29 @@ msgstr ""
 "HTML ëììì ìëëììì íìíëë. ëì ìììëì ìëëìì êëì ìì"
 "íì ìê ììë êëì ëê ììíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "íìí ìë ëë êì êë ìì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "êììë ììì íë ìëì êìí ì ìê íëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "êììë ìì íë ìë ìì ìê ììì ëìì ìë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "êììë ìì íë ìëì ëí ìì ìê ììì ëìì ìë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "ëë ìíììë ìì ìë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8787,65 +8255,53 @@ msgstr ""
 "ì êëì ììíë ìíììë íë ììí ëìì ëë ëê, ëìì ëë, íë"
 "ë ìíëíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "ì êëì ììíë ëë íëì ëìí ëìì ëë ëê ììì ììíëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "ì êëì ììíë ëë íëì ëìí ëìì ëë ëê ììì ììíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Mark citations in the message \"Preview\""
 msgstr "ëìì \"ëë ëê\"ìì ììí ëëì íìíê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ëìì \"ëë ëê\"ìì ììí ëëì íìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Citation highlight color"
 msgstr "ììë êì ì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Citation highlight color."
 msgstr "ììë êì ì."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable/disable caret mode"
 msgstr "ìë ëë ìê/ëê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "ìë ëëë ìëë, ì ëëììë ëìì ìì ë ììê ëìëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Default charset in which to display messages"
 msgstr "ëììë íìí êë ëìì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Default charset in which to display messages."
 msgstr "ëììë íìí êë ëìì."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTTPë íí HTML ëììì êëì ììëìëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -8855,33 +8311,27 @@ msgstr ""
 "ëíìíìì êëì ììëìì ììëë. \"1\" - ììëì ìë ìëì ëìì "
 "êëì ììëìëë. \"2\" - íì ëíìíìì êëì ììëìëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Show Animations"
 msgstr "ìëëìì ëê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show animated images as animations."
 msgstr "ìëëììì ëì ìë êëì ìëëìììë ëëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show all message headers"
 msgstr "ëë ëìì íë íì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show all the headers when viewing a messages."
 msgstr "ëììë ë ë ëë íëë íìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "List of custom headers and whether they are enabled."
 msgstr "ììì ìì íëì ê íëë ììíì ìëì ëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 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;"
@@ -8892,82 +8342,68 @@ msgstr ""
 "ìíê ëì ììëë. XML êìì íìì &lt;header enabled&gt;ìëë - íë"
 "ë ëì ëêìì íìíë enabledë ììíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show photo of the sender"
 msgstr "ëë ìëì ììì íìíëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "ëìì ìê ììì ëë ìëì ììì íìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Search for the sender photo in local address books"
 msgstr "ëì ììëìì ëë ìë ìì êì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "This option would help in improving the speed of fetching."
 msgstr "ì ìììë êììê ìëë ëì ì ììëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ëëë ìíëí ëìê ìëì êìí MIME íì ëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
 "in GNOME's MIME type database may be used for displaying content."
-msgstr ""
-"íì MIME íìì ëí ëìê ìëëì ìì ììë, ì ëëì ìë MIME íìì"
-"ì ëëë ìíëí ëìë ëíëë (êëì MIME íì ëìíëìììì) ëì"
-"ê ëìì íìíëë ììíëë."
+msgstr "íì MIME íìì ëí ëìê ìëëì ìì ììë, ì ëëì ìë MIME íììì ëëë ìíëí ëìë ëíëë(êëì MIME íì ëìíëìììì) ëìê ëìì íìíëë ììíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "ìì ìêì ìëë ìì êìë íìíê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "ìì ìêì ìëë ìì êìë íìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Timeout for marking messages as seen"
 msgstr "ëììë ìì êìë íìíë êê ìê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "ëììë ìì êìë íìíë êê ìê, ëëì ëì."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Sender email-address column in the message list"
 msgstr "ëìì ëëì ëë ìë ììëì ìì ì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "ëìì ëëì ëë ìì ëë ìëì ììëìì íìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
-msgstr "ìë ëêì \"ëìì\" ììì \"ëë ìë\" ë \"ìë\" ìì êì êêì ììíì êìíëë"
+msgstr ""
+"ìë ëêì \"ëìì\" ììì \"ëë ìë\" ë \"ìë\" ìì êì êêì ìì"
+"íì êìíëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8975,42 +8411,29 @@ msgstr ""
 "ìë ëêì \"ëìì\" ììì \"ëë ìë\" ë \"ìë\" ìì êì êêì ìì"
 "íì êìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Show deleted messages in the message-list"
 msgstr "ëìì ëëì ììí ëììë íìíëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "ëìì ëëì ììí ëììë íìíëë (ìììì êìëë)."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid "Enable local folders"
-msgstr "ëì íë ìì"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-msgid "Whether to show local folders (On This Computer) in a folder tree"
-msgstr "íë êììì ëì íëë (\"ì ìíí\" íë) íìíì ìë"
+msgstr "ëìì ëëì ììí ëììë íìíëë(ìììì êìëë)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Enable search folders"
-msgstr "êì íë ìì"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+msgid "Enable Unmatched search folder"
+msgstr "íë ìì êì íë ìì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid "Enable search folders on startup."
-msgstr "ììí ë êì íë ìì."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+msgid ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
+msgstr "êì íëìì íë ìì êì íëë ììíëë. êì íëë ììíì ììë ìë ìë íì ììëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "íëë ëë ëêë êìê ìíì ììëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 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."
@@ -9018,22 +8441,19 @@ msgstr ""
 "ì íë í ëë ìê ìì ëìì êììë ëì ììëëë. ëëìì ëì ìí"
 "ì ìêíê ê íëì ëí ëë ëêë ììëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Height of the message-list pane"
 msgstr "ëìì ëë ìì ëì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Height of the message-list pane."
 msgstr "ëìì ëë ìì ëì."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "State of message headers in paned view"
 msgstr "ì ëë ëêìì ëìì íë ìí"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded and \"1\" = collapsed"
@@ -9041,70 +8461,55 @@ msgstr ""
 "ëìì íëë êëêìì ììíì íìíì êìíëë. \"0\" = íì, \"1\" = "
 "ìì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Width of the message-list pane"
 msgstr "ëìì ëë ìì ëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Width of the message-list pane."
 msgstr "ëìì ëë ìì ëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Layout style"
 msgstr "ëì ëì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
-msgstr ""
-"ëë ëê ìì ëìì ëë ììì ëêíì ìëì ë ì êìíë ëì ëì. "
-"\"0\"ì (ìíì ëì) ëë ëê ìì ëìì ëë ìëì ëëë. \"1\"ì (ì"
-"ë ëê) ëë ëê ìì ëìì ëë ìì ëëí ëëë."
+msgstr "ëë ëê ìì ëìì ëë ììì ëêíì ìëì ë ì êìíë ëì ëì. \"0\"ì(ìíì ëì) ëë ëê ìì ëìì ëë ìëì ëëë. \"1\"ì(ìë ëê) ëë ëê ìì ëìì ëë ìì ëëí ëëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Variable width font"
 msgstr "êëí êê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "The variable width font for mail display."
 msgstr "ëìì íìí ë ììí êëí êê."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Terminal font"
 msgstr "íëë êê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "The terminal font for mail display."
 msgstr "ëìì íìí ë ììí íëë êê."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Use custom fonts"
 msgstr "ììì ìì êê ìì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Use custom fonts for displaying mail."
 msgstr "ëìì íìí ë ììì ìì êêì ììíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "ëë ìë/ìì/ìì ììì ììë êëíê íì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -9112,43 +8517,11 @@ msgstr ""
 "ëë ìë/ìì/ìì ììì ììë address_countì ììí êìëí êëíê í"
 "ìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "Display only message texts not exceeding certain size"
-msgstr "ìì íêë ëìêì ìë ëìì íìíë íì"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
-"ì êëì ììíë 'message_text_part_limit' íì ììí íêë ëìêì ì"
-"ë íìíë íìíëë."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Message text limit for display"
-msgstr "ëìì ëì íì ìí"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-"ìëëììì íìí ì ìë ëìì íìíì ìë íêë KB ëìë ììíë"
-"ë. êëêì 4096(4MB)ìëë. ì êì 'force_message_limit' íë ììí êì"
-"ìë ììëëë."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ëë ìë/ìì/ìì ììì íìí ììì êì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9156,13 +8529,11 @@ msgstr ""
 "êë ëìì ëë ëêìì íìí ììì êìë ììíëë. êìë ëìêë "
 "'...'ìë íìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Thread the message-list based on Subject"
 msgstr "ìëì ëë ëìì ëëì êíë íìíëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9170,24 +8541,23 @@ msgstr ""
 "ëììì In-Reply-To íì References íëê ìì êìì ëìì ìëìë êí"
 "ë íìë í êìì ìë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Default value for thread expand state"
 msgstr "êíë íì ìíì ëí êëê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
-msgstr "ì ììì êíëë êëêìë íì ìíë íì ìí ìíë íì ììíëë. ìëëìì ëì ììíì íëë."
+msgstr ""
+"ì ììì êíëë êëêìë íì ìíë íì ìí ìíë íì ììíëë. "
+"ìëëìì ëì ììíì íëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "íë êíëì ìê ëììë êììë êíëë ìëíì ìë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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 "
@@ -9196,46 +8566,42 @@ msgstr ""
 "ì ììì íë êíëì ìê ëììë êììë êíëë ìëíì ìëë ìì"
 "íëë. ìëëìì ëì ììíì íëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "íë êììì êìì ìì ììëë íì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
 "Computer and Search folders, otherwise accounts are sorted based on an order "
 "given by a user"
-msgstr "ëì ëêìì êìì ìëíëë ììí ëëì ëíëëë. ììë êìì ìì ììëë ìëíëë. ë, \"ì ìíí\"ì \"êì\" íëë ìììëë. êììë êìì ìììê ììí ììëë ìëíëë"
+msgstr ""
+"ëì ëêìì êìì ìëíëë ììí ëëì ëíëëë. ììë êìì ìì "
+"ììëë ìëíëë. ë, \"ì ìíí\"ì \"êì\" íëë ìììëë. êìì"
+"ë êìì ìììê ììí ììëë ìëíëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Log filter actions"
 msgstr "íí ëì êë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Log filter actions to the specified log file."
 msgstr "ììí ëê íìì ëí íí ëìì êëíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Logfile to log filter actions"
 msgstr "íí ëìì êëí ëê íì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Logfile to log filter actions."
 msgstr "íí ëìì êëí ëê íììëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Flush Outbox after filtering"
 msgstr "ííë íì ëë íìí íëì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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 "
@@ -9245,52 +8611,40 @@ msgstr ""
 "ë' íí ëìì ììíì êì ë ëìë ëìì ìíí í ì 1ë ëì ììëë"
 "ë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Default forward style"
 msgstr "êë ìë ëìì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "ëìì-íì ëìì (\"normal\", \"full headers\", \"source\")"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt on empty subject"
 msgstr "ìëì ììë ëìëê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ìë ìë ëììë ëëë í ë ëìëëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when emptying the trash"
 msgstr "ìì ëììë ëì ë íì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "ìì ëììë ëì ë ëìëëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt when user expunges"
 msgstr "ììí ìì ë ëìëê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ìììê íëì ìì ëììë ììí ììë í ë ëìëëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "ëì ììë ìëíì ìì ììììê ëë ë ëìëê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9298,58 +8652,48 @@ msgstr ""
 "ëì ììë ìëíì ìì ììììê ëììë ëë êì ëëíì êêíë ê"
 "ëì ëê ìëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when user only fills Bcc"
 msgstr "Bccë ììíì ë ëìëëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Toë Ccë ëë ìëì ìë ìíë ëììë ëëë í ë ëìëëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ìíì ìë HTMLì ëëë í ë ëìëëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "HTML ëììë ìíì ìë ìëíí HTML ëìì ëëë í ë ëìëëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "10ê ììì ëììë ìëê í ë ëìëëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "ìììê 10ê ììì ëììë íëì ìë, ìëë ì ì ëìëëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt while marking multiple messages"
 msgstr "ìë ê ëììì íìíë í ë ëìëëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "ìë êì ëììì íìí ë íì ìëì íì ìë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Prompt when deleting messages in search folder"
 msgstr "êì íëìì ëììë ìì ë ëìëëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 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 "
@@ -9358,13 +8702,35 @@ msgstr ""
 "êì êêìì ìêíë ê ìëë, ìê íëìì ëììë ìì êì ëììë "
 "ìêí ììíëê ëëíì êêíë êëì ëê ìëë."
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
+msgstr "íë êììì íëë ëìëêë ëìíì ëìëëë"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+msgid ""
+"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
+"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr "ìì êëí êì: 'never' - ëìëêë íë êììì íë ëìë íìíì ìì, 'always' - ëìëì ìê ëìëêë íë êììì íë ëì íì, 'ask' - (ìëë êí ëë ëë ê) ììììê íì ìë."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
+msgstr "íë êììì íëë ëìëêë ìëíì ëìëëë"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
-#: ../mail/evolution-mail.schemas.in.h:165
+msgid ""
+"Possible values are: 'never' - do not allow move with drag &amp; drop of "
+"folders in folder tree, 'always' - allow move with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr "ìì êëí êì: 'never' - ëìëêë íë êììì íë ìêêë íìíì ìì, 'always' - ëìëì ìê ëìëêë íë êììì íë ìêê íì, 'ask' - (ìëë êí ëë ëë ê) ììììê íì ìë."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Prompt when replying privately to list messages"
 msgstr "ëìë ëìí ëììì êì íìì í ë ëìëëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -9372,13 +8738,11 @@ msgstr ""
 "ëìë ëìíìì ëì ëììì êì ëìì ëë êì ëëíì êêíë êë"
 "ì ëê ìëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "ëìë ëìíìì êì íìì êëìë í ë ëìëëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 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 "
@@ -9388,21 +8752,18 @@ msgstr ""
 "ì Reply-To: íëê ììëì ììì ëìì ëìíë ëëê ëë êì ëëí"
 "ì êêíë íì ìì ëê ìëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Prompt when replying to many recipients"
 msgstr "ëì ììììê íìí ë ëìëëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
 "ëì ìëìê íìì ëëë í ë ëëíì êêíë íì ìì ëê ìëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
@@ -9410,70 +8771,59 @@ msgstr ""
 "ìììê ìì íìë ëììë ìëíêë ëììì íìí êì ëìì ìì ë"
 "ìì ìëë ëìëëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "Possible values are: 'never' - to never close browser window, 'always' - to "
 "always close browser window or 'ask' - (or any other value) will ask user."
-msgstr "ìì êëí êì: 'never' - ëëìì ìì ëì ìì, 'always' - íì ëëìì ìì ëì, 'ask' - (ìëë êí ëë ëë ê) ììììê íì ìë."
+msgstr ""
+"ìì êëí êì: 'never' - ëëìì ìì ëì ìì, 'always' - íì ëëì"
+"ì ìì ëì, 'ask' - (ìëë êí ëë ëë ê) ììììê íì ìë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Empty Trash folders on exit"
 msgstr "ëë ë ìì ëìì íëë ëìëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ìëëìì ëë ë ëë ìì ëìì íëë ëìëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ëë ë íìíì ëì ìì ëì êê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ëë ë íìíì ëì ìì ìê êê."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Last time Empty Trash was run"
 msgstr "ëìëìë íìíì ëì ìê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr "ëìëìë íìíì ëì ìê, 1970ë 1ì 1ìëí (Epoch) ìë ë ì."
+msgstr "ëìëìë íìíì ëì ìê, 1970ë 1ì 1ìëí(epoch) ìë ë ì."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
-#: ../mail/evolution-mail.schemas.in.h:181
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ìëë ìí íììì íìí ìê, ì ëì."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-#: ../mail/evolution-mail.schemas.in.h:182
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Level beyond which the message should be logged."
 msgstr "ìë ëììë êëíì ëê."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
 "ì êì êì êëíëë. \"0\"ì ìë, \"1\"ì êê, \"2\"ë ëëê ëìì."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Show original \"Date\" header value."
 msgstr "ìëì \"ëì\" íë êì íìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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 "
@@ -9483,13 +8833,11 @@ msgstr ""
 "íì ìêìë íìíëë.) êììë \"Date\" íë êì ìììê ììí íì"
 "ê íì íì ìêëì ëì íìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "List of Labels and their associated colors"
 msgstr "ëìë ë ëìë ìì ëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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."
@@ -9497,55 +8845,44 @@ msgstr ""
 "ìëëìì ëì ìíëíì ììí ëìë ëëìëë. ì ëëìë <ìë>:<ì> "
 "íìì ëììì ëì ììëë. ìì HTML ëì 16ìì ììëì ììíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Check incoming mail being junk"
 msgstr "ìíëì êì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Run junk test on incoming mail."
 msgstr "ëì ëìì ëí ìíëì êìë ìííëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Empty Junk folders on exit"
 msgstr "ëë ë ìíëì íëë ëìëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "ìëëìì ëë ë ëë ìí ëì íëë ëìëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ëë ë ìí ëìì ëì ìì ëì êê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ëë ë íìíì ëì ìì ìê êê."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Last time Empty Junk was run"
 msgstr "ëìëìë ìí ëìì ëì ìê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-"ëìëìë ìí ëìì ëì ìê, 1970ë 1ì 1ìëí (Epoch) ìë ë ì."
+msgstr "ëìëìë ìí ëìì ëì ìê, 1970ë 1ì 1ìëí(epoch) ìë ë ì."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "The default plugin for Junk hook"
 msgstr "ìí ëì ííì ëí êë íëêì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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 "
@@ -9555,13 +8892,11 @@ msgstr ""
 "ë. êë ëë íëêìì ììíì ìë êì, ìì êëí ëë íëêìì ë"
 "ì ììíì ììëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "ììëìì ëë ìë ììëìì ììë ì êìíëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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 "
@@ -9572,15 +8907,13 @@ msgstr ""
 "í ëìì ìëëê íëíëë. ìë ìì ìëëë ììëì ìì ëëë. LDAP"
 "ì êì ìê ììëì ìë ììì ììí êì ëë ìë ììëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "ìíëì ííëí ë ëì ììëììë ììë ìì ë ì êìíëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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 "
@@ -9590,13 +8923,11 @@ msgstr ""
 "ìëì ìëì ëë ëìì ììí ë, ëì ììëììë ììë ìì ëì ìë"
 "ë êìíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "ìí ëì êìì ììì ìì íëë ììíì êìíëë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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 "
@@ -9605,13 +8936,11 @@ msgstr ""
 "ìí ëì êìì ììì ìì íëë ììíì êìíëë. ì ììì ììíê "
 "íëë ììíë ìí ëì êì êëì ìëë ëì ì ììëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Custom headers to use while checking for junk."
 msgstr "ìí ëìì êìí ë ììí ììì ìì íë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9619,35 +8948,31 @@ msgstr ""
 "ìí ëìì êìí ë ììí ììì ìì íë. ëëì ê íëì \"íëìë=ê"
 "\" íìì ëìììëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "UID string of the default account."
 msgstr "êë êìì UID ëìì."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Save directory"
 msgstr "ìì ëëíë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Directory for saving mail component files."
 msgstr "ëì êë íìì ììí ëëíë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Composer load/attach directory"
 msgstr "ëìì ìì ììëìê/ìë ëëíë"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Directory for loading/attaching files to composer."
 msgstr "ëìì ììì íìì ììëìê ìëí ë ììí ëëíë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Check for new messages on start"
 msgstr "ììí ë ì ëììë êì"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9655,13 +8980,12 @@ msgstr ""
 "ìëëìì ììí ë ì ëììë íìíì ìë. ì ë ëë íìíì ëììë "
 "ëëëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Check for new messages in all active accounts"
 msgstr "ëë êìì ëí ì ëììë êì"
 
 # "Check for new messages every X messages" -> "ì ëì íì(_N), ë"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -9671,13 +8995,11 @@ msgstr ""
 "ì ìì êìì ì ëììë íìíì ìë. ì ììì \"send_recv_on_start\" ì"
 "ìê êìë ììíëë."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
-#: ../mail/evolution-mail.schemas.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Server synchronization interval"
 msgstr "ìë ëêí ìê"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
-#: ../mail/evolution-mail.schemas.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9685,14 +9007,20 @@ msgstr ""
 "ìëë ìì ëìì ëê ìíì ìê ëì ìëì ëêííì ìíëë. ì êê"
 "ì ììí 30ì ìì ëìì íëë."
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+#. Translators: This is the a list of words for the attach reminder plugin to look
+#. for in a message body. Please use any number of words here in your language that might
+#. indicate that an attachment should have been attached to the message.
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
+msgid "['attachment','attaching','attached','enclosed']"
+msgstr "['attachment','attaching','attached','enclosed','ìë']"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr "ìë ìë íëêìì ëìì ëëìì ììë êê ëë"
 
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:2
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
@@ -9703,16 +9031,16 @@ msgid "Address book source"
 msgstr "ììë ìë"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-msgid "Address book to use for storing automatically synced contacts"
-msgstr "ìëìë ëêíí ìëìë ììíëë ììí ììë"
+msgid "Address book to use for storing automatically synced contacts."
+msgstr "ìëìë ëêíí ìëìë ììíëë ììí ììë."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Auto sync GAIM contacts"
-msgstr "GAIM ìëì ìë ëêí"
+msgid "Auto sync Pidgin contacts"
+msgstr "íì ìëì ìë ëêí"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Whether GAIM contacts should be automaticall synced"
-msgstr "GAIM ìëìë ìëìë ëêííì ìë"
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr "íì ìëìë ìëìë ëêííì ìë."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
 msgid "Enable autocontacts"
@@ -9720,40 +9048,47 @@ msgstr "ìë ìëì ìì"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
 msgid ""
-"Whether contacts should be automatically added to the user's addressbook"
-msgstr "ìëìë ìììì ììëì ìëìë ìêíì ìë"
+"Whether contacts should be automatically added to the user's address book."
+msgstr "ìëìë ìììì ììëì ìëìë ìêíì ìë."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-msgid "GAIM address book source"
-msgstr "GAIM ììë ìë"
+msgid "Pidgin address book source"
+msgstr "íì ììë ìë"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "Address book to use for storing automatically synced contacts from GAIM"
-msgstr "ìëìë ëêíí GAIM ìëìë ììíëë ììí ììë"
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+msgstr "ìëìë ëêíí íì ìëìë ììíëë ììí ììë."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM check interval"
-msgstr "GAIM íì êê"
+msgid "Pidgin check interval"
+msgstr "íì íì êê"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "Check interval for GAIM syncing of contacts"
-msgstr "GAIM ìëì ëêíì íì êê"
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr "íì ìëì ëêíì íì êê."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "GAIM last sync MD5"
-msgstr "GAIM ìê ëêí MD5"
+msgid "Pidgin last sync MD5"
+msgstr "íì ìê ëêí MD5"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "GAIM last sync time"
-msgstr "GAIM ìê ëêí ìê"
+msgid "Pidgin last sync MD5."
+msgstr "íì ìê ëêí MD5."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr "íì ìê ëêí ìê"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
+msgstr "íì ìê ëêí ìê."
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
 msgstr "ììì ìì íëì ëë"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
@@ -9764,17 +9099,14 @@ msgstr ""
 "ì êì ìê \";\"ìë êë."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
 msgstr "êë ìë íìê"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
 msgstr "íìêë ììí êë ëëì."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 #: ../plugins/external-editor/external-editor.c:125
 msgid "Automatically launch when a new mail is edited"
 msgstr "ì ëìì íìí ë ìëìë ìí"
@@ -9784,12 +9116,10 @@ msgid "Automatically launch editor when key is pressed in the mail composer."
 msgstr "ëì ìì ììì íë ëëë ìëìë íìê ìí."
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "ìê êë êëêìë íí"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
@@ -9806,12 +9136,10 @@ msgid "Whether to delete processed iTip objects"
 msgstr "ìëí iTip ìëìíë ììíì ìë"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Notify new messages for Inbox only."
 msgstr "ëì íìíì êììë ì ëìì ìë."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ëì íìí íëìë ì ëììë ìëì ìë."
 
@@ -9824,12 +9152,10 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "ì ëììê ëìíë D-BUS ëììê ëìíëë."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "ìë ìììì ììì ìì."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ì ëììê ëìíì ë ìë ììì ì ëì ììì íì."
 
@@ -9842,53 +9168,51 @@ msgid "Whether show message over the icon when new messages arrive."
 msgstr "ì ëììê ëìíë ììì ìì ëììë íìíì ìë."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Play sound when new messages arrive."
-msgstr "ì ëììê ëìíë ììë ìì."
+msgid "Enable audible notifications when new messages arrive."
+msgstr "ì ëììê ëìíì ë ìëë ìë."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Whether play sound or beep when new messages arrive."
-msgstr "ì ëììê ëìíë ììëë ììíì ì ìëë ëì."
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If \"false\", "
+"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
+"and \"notify-sound-use-theme\" keys are disregarded."
+msgstr "ì ëììê ëìíì ë ìë ìëìë ìëë ëì ìë. êìì êì, \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\", \"notify-sound-use-theme\" íë ëìëëë."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Beep or play sound file."
-msgstr "ì ìëë ëêë ììë íì ìì."
+msgid "Whether to emit a beep."
+msgstr "ì ìëë ëì ìë."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr ""
-"ì ëììê ëìíì ë ììë ì ìëë ëê, ìëë ììë íìì íëìí"
-"ëë."
+msgid "Whether to emit a beep when new messages arrive."
+msgstr "ì ëììê ëìíë ì ìëë ëì ìë."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound filename to be played."
 msgstr "ììí ììë íì ìë."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "ì ëììê ëìíë ììí ììë íì, ì ìë ëëê ìë êì."
+msgid ""
+"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
+"\" is \"true\"."
+msgstr "ì ëììê ëìíë ììí ììë íì, \"notify-sound-play-file\"ì ìì êì."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-msgid "FIXME"
-msgstr "FIXME"
+msgid "Whether to play a sound file."
+msgstr "ììë íìì ììíì ìë."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the 'notify-sound-file' key."
+msgstr "ì ëììê ëìíì ë ììë íìì ììíì ìë. ììë íìì ìëì 'notify-sound-file' íë ììíëë."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 msgid "Use sound theme"
 msgstr "ììë íë ìì"
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr ""
-"ì ëììê ëìíë (ì ìë ëëê ìë êì) íë ììëë ììíëë."
+msgstr "ì ëììê ëìíë(ì ìë ëëê ìë êì) íë ììëë ììíëë."
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
 msgid "Mode to use when displaying mails"
@@ -9899,37 +9223,45 @@ msgid ""
 "The mode to use for displaying mails. \"normal\" makes Evolution choose the "
 "best part to show, \"prefer_plain\" makes it use the text part, if present, "
 "and \"only_plain\" forces Evolution to only show plain text"
-msgstr "ëìì íìí ë ììí ëë. \"normal\"ì ìëëììì ììì íìí ëëì íìíê, \"prefer_plain\"ì íìí ëëì ììë ììíê, \"only_plain\"ì ìì ìë íìíë íìíëë"
+msgstr ""
+"ëìì íìí ë ììí ëë. \"normal\"ì ìëëììì ììì íìí ëëì "
+"íìíê, \"prefer_plain\"ì íìí ëëì ììë ììíê, \"only_plain\"ì "
+"ìì ìë íìíë íìíëë"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
 msgid "Whether to show suppressed HTML output"
 msgstr "ìê HTML ìëì íìíì ìë"
 
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+msgid "List of Destinations for publishing"
+msgstr "êêí ëì ìì ëë"
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr "ì íë ëëì êêí ììì ëì ìì ëëì ììíëë. ê êì í ììë êêíë XML ììì ììíëë."
+
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 msgstr "ìì íëêììì ëìì ëë ëì ììí í/ê ìì ëë."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Skip development warning dialog"
 msgstr "êë ëì êê êë ëê"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ìëëì êë ëìì êê ëí ììë êë ëì ìë."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Initial attachment view"
 msgstr "ìì ìë ëê"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -9944,13 +9276,11 @@ msgstr "ìì íì ìí íë"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser ëí ììì ìì íë."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
-#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:316
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:311
 msgid "Start in offline mode"
 msgstr "ìê ìì ìíìì ìì"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "ìëëìì ììì ìê ìíê ìëë ìê ìì ìíë ììíëì ìë."
 
@@ -9964,32 +9294,26 @@ msgid ""
 msgstr "ìê ìì ìíìì ììí ë ëêíí íëì êë ëë."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Enable express mode"
 msgstr "êì ëë ìì"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Flag that enables a much simplified user interface."
 msgstr "ìì êëí ììì ìííììë ììíë íëê."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Window buttons are visible"
 msgstr "ì ëì íìíì ìë"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether the window buttons should be visible."
 msgstr "ì ëìë íìíì íëì ìë."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Window button style"
 msgstr "ì ëì ëìì"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -9999,73 +9323,60 @@ msgstr ""
 "\"toolbar\"ì êì êë ëê ëì ììì ëëì ëìì ëììê êìëëë."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Toolbar is visible"
 msgstr "ëê ëìì íìíëë"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the toolbar should be visible."
 msgstr "ëê ëìì íìíì ìë."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Sidebar is visible"
 msgstr "ëì ëìì íìíëë"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Whether the sidebar should be visible."
 msgstr "ëì ëìì íìíì ìë."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Statusbar is visible"
 msgstr "ìí íììì íìíëë"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the status bar should be visible."
 msgstr "ìí íììì íìíì ìë."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ë ìì ììí ë êëìë ëìì ìíëí ID íì ëë."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Default sidebar width"
 msgstr "êë ëì ëì ëë"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default width for the sidebar, in pixels."
 msgstr "ëì ëìì êë ëë, íì ëì."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
 msgid "Use only local spam tests."
 msgstr "ëì ìí íìíë ììíëë."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
 msgid "Use only the local spam tests (no DNS)."
-msgstr "ëì ìí íìíë ììíëë (DNSë ììíì ììëë)."
+msgstr "ëì ìí íìíë ììíëë(DNSë ììíì ììëë)."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
 msgid "Socket path for SpamAssassin"
 msgstr "ìíììì ìì êë"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
 msgid "Use SpamAssassin daemon and client"
 msgstr "ìíììì ëë ë íëììí ìì"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "ìíììì ëë ë íëììíë (spamc/spamd) ììíëë."
+msgstr "ìíììì ëë ë íëììíë(spamc/spamd) ììíëë."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
 msgid "SpamAssassin client binary"
@@ -10075,142 +9386,415 @@ msgstr "ìíììì íëììí ëìëë"
 msgid "SpamAssassin daemon binary"
 msgstr "ìíììì ëë ëìëë"
 
-#: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
-#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-formatter-attachment.c:363
+#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-bar.c:101
+#: ../widgets/misc/e-attachment-bar.c:106
+#: ../widgets/misc/e-attachment-paned.c:176
+#: ../widgets/misc/e-attachment-paned.c:181
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "ìë"
+
+#: ../em-format/e-mail-formatter-attachment.c:369
+msgid "Display as attachment"
+msgstr "ìëë íì"
+
+#: ../em-format/e-mail-formatter.c:1368 ../mail/e-mail-tag-editor.c:327
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:67
 msgid "From"
 msgstr "ëë ìë"
 
-#: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "íì ìì"
 
-#: ../em-format/em-format.c:1066 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2667 ../mail/em-format-html.c:2735
-#: ../mail/em-format-html.c:2758 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/e-mail-formatter.c:1371
+#: ../em-format/e-mail-formatter-utils.c:182
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../modules/mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "ìì"
 
-#: ../em-format/em-format.c:1067 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2739
-#: ../mail/em-format-html.c:2761 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/e-mail-formatter.c:1372
+#: ../em-format/e-mail-formatter-utils.c:184
+#: ../em-format/e-mail-formatter-utils.c:207
+#: ../modules/mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "ìì ìì"
 
-#: ../em-format/em-format.c:1068 ../em-format/em-format-quote.c:465
+#: ../em-format/e-mail-formatter.c:1373
+#: ../em-format/e-mail-formatter-quote-headers.c:165
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
-#: ../smime/lib/e-cert.c:1126
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
+#: ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "ìë"
 
-#: ../em-format/em-format.c:1069 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
+#: ../em-format/e-mail-formatter.c:1374 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:73 ../widgets/misc/e-dateedit.c:526
 #: ../widgets/misc/e-dateedit.c:548
 msgid "Date"
 msgstr "ëì"
 
-#: ../em-format/em-format.c:1070 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/e-mail-formatter.c:1375 ../modules/mail/em-mailer-prefs.c:74
 msgid "Newsgroups"
 msgstr "ëìêë"
 
-#: ../em-format/em-format.c:1071 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/e-mail-formatter.c:1376 ../modules/mail/em-mailer-prefs.c:75
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "ìê"
 
-#: ../em-format/em-format.c:1474
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../em-format/e-mail-formatter-headers.c:114
+#: ../plugins/mail-notification/mail-notification.c:396
 #, c-format
-msgid "%s attachment"
-msgstr "%s ìë"
+msgid "From: %s"
+msgstr "ëë ìë: %s"
 
-#: ../em-format/em-format.c:1588
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME ëììë ëìí ì ììëë: ì ì ìë ìëê ëìíìëë"
+#: ../em-format/e-mail-formatter-headers.c:134
+#: ../em-format/e-mail-formatter-headers.c:139
+msgid "(no subject)"
+msgstr "(ìë ìì)"
 
-#: ../em-format/em-format.c:1782 ../em-format/em-format.c:2010
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME ëììë ëìí ì ììëë. ììë íìíëë."
+#: ../em-format/e-mail-formatter-headers.c:340
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "ì ëììë %sì(ê) %s ìêìë ëëìëë."
 
-#: ../em-format/em-format.c:1793
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "multipart/encryptedì ììíì ìë ìíí ëìì ììíìëë"
+#: ../em-format/e-mail-formatter-image.c:152
+msgid "Regular Image"
+msgstr "ìë êë"
 
-#: ../em-format/em-format.c:1813
-msgid "Could not parse PGP/MIME message"
-msgstr "PGP/MIME ëììë ëìí ì ììëë"
+# tooltip
+#: ../em-format/e-mail-formatter-image.c:158
+msgid "Display part as an image"
+msgstr "ì ëëì êëìë íìíëë"
 
-#: ../em-format/em-format.c:1814
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "PGP/MIME ëììë ëìí ì ììëë: ì ì ìë ìëê ëìíìëë"
+#: ../em-format/e-mail-formatter-message-rfc822.c:237
+msgid "RFC822 message"
+msgstr "RFC822 ëìì"
 
-#: ../em-format/em-format.c:2035
-msgid "Unsupported signature format"
-msgstr "ììíì ìë ìë íììëë"
+#: ../em-format/e-mail-formatter-message-rfc822.c:243
+msgid "Format part as an RFC822 message"
+msgstr "ì ëëì RFC822 ëììë íìíëë"
+
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../mail/e-mail-label-tree-view.c:99
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1255
+#: ../modules/cal-config-google/e-google-chooser.c:209
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../widgets/menus/gal-define-views-dialog.c:352
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+msgid "Name"
+msgstr "ìë"
+
+#: ../em-format/e-mail-formatter-print.c:53 ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:574
+msgid "Size"
+msgstr "íê"
+
+#. Add encryption/signature header
+#: ../em-format/e-mail-formatter-print-headers.c:130
+#: ../mail/e-mail-config-security-page.c:642
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:207
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:131
+msgid "Security"
+msgstr "ëì"
 
-#: ../em-format/em-format.c:2048 ../em-format/em-format.c:2230
-msgid "Error verifying signature"
-msgstr "ìëì íìíë ì ìëê ëìíìëë"
+#: ../em-format/e-mail-formatter-print-headers.c:147
+msgid "GPG signed"
+msgstr "GPG ìëë"
 
-#: ../em-format/em-format.c:2049 ../em-format/em-format.c:2215
-#: ../em-format/em-format.c:2231
-msgid "Unknown error verifying signature"
-msgstr "ìëì íìíë ì ì ì ìë ìëê ëìíìëë"
+#: ../em-format/e-mail-formatter-print-headers.c:152
+msgid "GPG encrpyted"
+msgstr "GPG ìííë"
 
-#: ../em-format/em-format.c:2324
-msgid "Could not parse PGP message: "
-msgstr "PGP ëììë ëìí ì ììëë:"
+#: ../em-format/e-mail-formatter-print-headers.c:158
+msgid "S/MIME signed"
+msgstr "S/MIME ìëë"
+
+#: ../em-format/e-mail-formatter-print-headers.c:164
+msgid "S/MIME encrpyted"
+msgstr "S/MIME ìííë"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:476 ../mail/em-format-html.c:2860
-#: ../modules/mail/em-mailer-prefs.c:1046
+#: ../em-format/e-mail-formatter-quote-headers.c:176
+#: ../em-format/e-mail-formatter-utils.c:316
+#: ../modules/mail/em-mailer-prefs.c:1121
 msgid "Mailer"
 msgstr "ëì íëêë"
 
-# ëìì ìííì ìë.
-#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1235
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Forwarded Message --------"
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
+#: ../em-format/e-mail-formatter-text-enriched.c:115
+msgid "Richtext"
+msgstr "ëìíìí"
+
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:108
+#: ../em-format/e-mail-formatter-text-enriched.c:121
+msgid "Display part as enriched text"
+msgstr "ì ëëì ëìíìíë íì"
+
+#: ../em-format/e-mail-formatter-quote-text-html.c:104
+#: ../em-format/e-mail-formatter-text-html.c:340
+msgid "HTML"
+msgstr "HTML"
+
+#: ../em-format/e-mail-formatter-quote-text-html.c:110
+#: ../em-format/e-mail-formatter-text-html.c:346
+msgid "Format part as HTML"
+msgstr "ì ëëì HTMLë íìíëë"
+
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123
+#: ../em-format/e-mail-formatter-text-plain.c:182
+msgid "Plain Text"
+msgstr "ìë íìí"
+
+#: ../em-format/e-mail-formatter-quote-text-plain.c:129
+#: ../em-format/e-mail-formatter-text-plain.c:188
+msgid "Format part as plain text"
+msgstr "ìë íìíë íì"
+
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid "Unsigned"
+msgstr "ìë ìì"
 
-#. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:248
-#, c-format
-msgid "%s (cancelled)"
-msgstr "%s (ììí)"
+#: ../em-format/e-mail-formatter-secure-button.c:65
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"ì ëìììë ìëì ììëë.  ëììë ëë ìëì íìí ì ëìí ì ìì"
+"ëë."
 
-#. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:251
-#, c-format
-msgid "%s (completed)"
-msgstr "%s (ìë)"
+#: ../em-format/e-mail-formatter-secure-button.c:66
+msgid "Valid signature"
+msgstr "ìëë ìë"
 
-#. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:254
-#, c-format
-msgid "%s (waiting)"
-msgstr "%s (ëê ì)"
+#: ../em-format/e-mail-formatter-secure-button.c:66
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"ì ëììë ìëëìê ìëì ìëëëë.  ëììë ëë ìëì ê ìëì ê"
+"ì íìíëë."
 
-#. Translators: This is a running activity which
-#. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:258
-#, c-format
-msgid "%s (cancelling)"
-msgstr "%s (ììíë ì)"
+#: ../em-format/e-mail-formatter-secure-button.c:67
+msgid "Invalid signature"
+msgstr "ìëë ìë"
 
-#: ../e-util/e-activity.c:260
-#, c-format
-msgid "%s"
-msgstr "%s"
+#: ../em-format/e-mail-formatter-secure-button.c:67
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"ì ëììì ìëì íìí ì ììëë. ëìì ìììì ëêëìì ì ììë"
+"ë."
 
-#: ../e-util/e-activity.c:265
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% ìë)"
+#: ../em-format/e-mail-formatter-secure-button.c:68
+msgid "Valid signature, but cannot verify sender"
+msgstr "ìëë ìëììë, ëë ìëì íìí ì ììëë"
 
-#: ../e-util/e-charset.c:53
-msgid "Arabic"
-msgstr "ìëì"
+#: ../em-format/e-mail-formatter-secure-button.c:68
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"ì ëììë ìëë ìëìë ììëììëë. íìë ëììë ëë ìëì íì"
+"í ì ììëë."
+
+#: ../em-format/e-mail-formatter-secure-button.c:69
+msgid "Signature exists, but need public key"
+msgstr "ìëì ììë, êêíê íìíëë"
+
+#: ../em-format/e-mail-formatter-secure-button.c:69
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr "ì ëììë ìëëì ììë, ìëì íëíë êê íê ììëë."
+
+#: ../em-format/e-mail-formatter-secure-button.c:76
+msgid "Unencrypted"
+msgstr "ìíí ì ë"
+
+#: ../em-format/e-mail-formatter-secure-button.c:76
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"ì ëììë ìíííì ìììëë.  ìíëì íí ìëëë ëì ëë ìëì "
+"ì ëììë ëì ì ììëë."
+
+#: ../em-format/e-mail-formatter-secure-button.c:77
+msgid "Encrypted, weak"
+msgstr "ìííë, ìí"
+
+#: ../em-format/e-mail-formatter-secure-button.c:77
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"ëììê ìííëì ììë, ìí ìíí ìêëììë ìííëììëë.  ëë "
+"ìëì ì ëììì ëìì ìì ëë ê ìëê íìë, íììì ìê ëì ëê"
+"ëíìë ììëë."
+
+#: ../em-format/e-mail-formatter-secure-button.c:78
+msgid "Encrypted"
+msgstr "ìííë"
+
+#: ../em-format/e-mail-formatter-secure-button.c:78
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"ëììê ìííëì ììëë.  ëë ìëì ì ëììì ëìì ìì ëêë ì"
+"ëìëë."
+
+#: ../em-format/e-mail-formatter-secure-button.c:79
+msgid "Encrypted, strong"
+msgstr "ìííë, êë"
+
+#: ../em-format/e-mail-formatter-secure-button.c:79
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"ëììê ìííëì ììë, ìí ìíí ìêëììë ìííëììëë.  íì"
+"ìì ìê ëì ëë ìëì ì ëììì ëìì ìì ëë ê ëì ìëìëë."
+
+#: ../em-format/e-mail-formatter-secure-button.c:190
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_View Certificate"
+msgstr "ììì ëê(_V)"
+
+#: ../em-format/e-mail-formatter-secure-button.c:205
+msgid "This certificate is not viewable"
+msgstr "ì ìììë ë ì ììëë"
+
+# ìì ìëë êëë íìíëë ë
+#: ../em-format/e-mail-formatter-source.c:139
+msgid "Source"
+msgstr "ìë"
+
+# ìì ìëë êëë íìíëë ë
+#: ../em-format/e-mail-formatter-source.c:145
+msgid "Display source of a MIME part"
+msgstr "MIME ëëì ìëì íì"
+
+#: ../em-format/e-mail-parser-application-mbox.c:108
+#, c-format
+msgid "Error parsing MBOX part: %s"
+msgstr "MBOX ëëì íìíëë ìë: %s"
+
+#: ../em-format/e-mail-parser-application-smime.c:104
+#, c-format
+msgid "Could not parse S/MIME message: %s"
+msgstr "S/MIME ëììë ëìí ì ììëë: %s"
+
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:91
+#, c-format
+msgid "Could not parse PGP message: %s"
+msgstr "PGP ëììë ëìí ì ììëë: %s"
+
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:93
+#: ../em-format/e-mail-parser-multipart-signed.c:144
+#, c-format
+msgid "Error verifying signature: %s"
+msgstr "ìëì íìíë ì ìëê ëìíìëë: %s"
+
+#: ../em-format/e-mail-parser-message-external.c:86
+msgid "Malformed external-body part"
+msgstr "ìë ëë ëëì íìì ìëëììëë"
+
+#: ../em-format/e-mail-parser-message-external.c:118
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP ììí(%s)ë êëíëë"
+
+#: ../em-format/e-mail-parser-message-external.c:129
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "ììí \"%2$s\"ì ëì íì(%1$s)ì êëíëë"
+
+#: ../em-format/e-mail-parser-message-external.c:131
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "ëì íì(%s)ì êëíëë"
+
+#: ../em-format/e-mail-parser-message-external.c:150
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "ìê ëìí(%s)ì êëíëë"
+
+#: ../em-format/e-mail-parser-message-external.c:167
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "ì ì ìë ìë ëìí(\"%s\" íì)ì êëíëë"
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:81
+#: ../em-format/e-mail-parser-multipart-signed.c:95
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME ëììë ëìí ì ììëë. ììë íìíëë."
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:99
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "multipart/encryptedì ììíì ìë ìíí ëìì ììíìëë"
+
+#: ../em-format/e-mail-parser-multipart-encrypted.c:119
+#, c-format
+msgid "Could not parse PGP/MIME message: %s"
+msgstr "PGP/MIME ëììë ëìí ì ììëë: %s"
+
+#: ../em-format/e-mail-parser-multipart-signed.c:129
+msgid "Unsupported signature format"
+msgstr "ììíì ìë ìë íììëë"
+
+#: ../em-format/e-mail-part-utils.c:493
+#, c-format
+msgid "%s attachment"
+msgstr "%s ìë"
+
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:248
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (ììí)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:251
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (ìë)"
+
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:254
+#, 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:258
+#, c-format
+msgid "%s (cancelling)"
+msgstr "%s (ììíë ì)"
+
+#: ../e-util/e-activity.c:260
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../e-util/e-activity.c:265
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% ìë)"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "ìëì"
 
 #: ../e-util/e-charset.c:54
 msgid "Baltic"
@@ -10287,14 +9871,14 @@ msgstr "ëìì"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1863
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../modules/calendar/e-cal-shell-view-actions.c:1927
+#: ../modules/itip-formatter/itip-view.c:235
 #: ../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:217 ../plugins/itip-formatter/itip-view.c:222
+#: ../e-util/e-datetime-format.c:217 ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow"
 msgstr "ëì"
 
@@ -10385,12 +9969,6 @@ msgstr "\"%s\" ìë ì"
 msgid "Writing \"%s\" to %s"
 msgstr "\"%s\" íìì %s ììì ìë ì"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
-#: ../plugins/google-account-setup/google-contacts-source.c:392
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "ì"
-
 #: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "ììíë ëì ìëê ëìíìëë"
@@ -10411,7 +9989,9 @@ msgstr "\"{0}\"(ì)ëë ìëì íìì ìë ììëë. ëì ì
 #: ../e-util/e-system.error.xml.h:2
 msgid ""
 "The file already exists in \"{0}\". Replacing it will overwrite its contents."
-msgstr "\"{0}\" ìì íìì ìë ììëë. ì íìì ëì ìë êì ëìì ììëëê ëëë."
+msgstr ""
+"\"{0}\" ìì íìì ìë ììëë. ì íìì ëì ìë êì ëìì ììëë"
+"ê ëëë."
 
 #: ../e-util/e-system.error.xml.h:3
 msgid "_Replace"
@@ -10429,11 +10009,27 @@ msgstr "\"{1}\" ëëìëë."
 msgid "Cannot open file \"{0}\"."
 msgstr "\"{0}\" íìì ì ì ììëë."
 
-#: ../e-util/e-util.c:245
+#: ../e-util/e-system.error.xml.h:7
+msgid "Failed to remove data source &quot;{0}&quot;."
+msgstr "&quot;{0}&quot; ëìí ììë ìêíëë ìííìëë."
+
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "íìë ìëë &quot;{1}&quot;ìëë."
+
+#: ../e-util/e-system.error.xml.h:9
+msgid "Failed to update data source &quot;{0}&quot;."
+msgstr "&quot;{0}&quot; ëìí ììë ìëìííëë ìííìëë."
+
+#: ../e-util/e-system.error.xml.h:10
+msgid "Failed to delete resource &quot;{0}&quot;."
+msgstr "&quot;{0}&quot; ëììë ììíëë ìííìëë."
+
+#: ../e-util/e-util.c:243
 msgid "Could not open the link."
 msgstr "ëíë ì ì ììëë."
 
-#: ../e-util/e-util.c:292
+#: ../e-util/e-util.c:290
 msgid "Could not display help for Evolution."
 msgstr "ìëëì ëìëì íìí ì ììëë."
 
@@ -10545,64 +10141,67 @@ msgstr "ëêí ìêì ìííììì"
 msgid "Choose a File"
 msgstr "íìì ìííììì"
 
-#: ../filter/e-filter-rule.c:686
+#: ../filter/e-filter-rule.c:741
 msgid "R_ule name:"
 msgstr "êì ìë(_U):"
 
-#: ../filter/e-filter-rule.c:718
-msgid "Find items that meet the following conditions"
-msgstr "ëì ìêì ëìíë íëì ììëë"
+#: ../filter/e-filter-rule.c:791
+msgid "all the following conditions"
+msgstr "ëì ìê ëë"
 
-#: ../filter/e-filter-rule.c:743
-msgid "If all conditions are met"
-msgstr "ëë ìêì ë ììëë"
+#: ../filter/e-filter-rule.c:792
+msgid "any of the following conditions"
+msgstr "ëì ìê ì íë"
 
-#: ../filter/e-filter-rule.c:744
-msgid "If any conditions are met"
-msgstr "ìë ìêìëë ììëë"
+#: ../filter/e-filter-rule.c:798
+msgid "_Find items which match:"
+msgstr "ëìì íëíë íë ìê(_F):"
 
-#: ../filter/e-filter-rule.c:747
-msgid "_Find items:"
-msgstr "íë ìê(_F):"
+#: ../filter/e-filter-rule.c:820
+msgid "Find items that meet the following conditions"
+msgstr "ëì ìêì ëìíë íëì ììëë"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../filter/e-filter-rule.c:776 ../libemail-engine/camel-null-store.c:28
+#: ../filter/e-filter-rule.c:835 ../libemail-engine/camel-null-store.c:28
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../widgets/misc/e-mail-signature-combo-box.c:369
 msgid "None"
 msgstr "ìì"
 
-#: ../filter/e-filter-rule.c:777
+#: ../filter/e-filter-rule.c:836
 msgid "All related"
 msgstr "êêë ëë"
 
-#: ../filter/e-filter-rule.c:778 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:837 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "íì"
 
-#: ../filter/e-filter-rule.c:779
+#: ../filter/e-filter-rule.c:838
 msgid "Replies and parents"
 msgstr "íì ë ê ìì ëì"
 
-#: ../filter/e-filter-rule.c:780
+#: ../filter/e-filter-rule.c:839
 msgid "No reply or parent"
 msgstr "íì ìêë ìì ëì ìì"
 
-#: ../filter/e-filter-rule.c:783
+#: ../filter/e-filter-rule.c:842
 msgid "I_nclude threads:"
 msgstr "êíë íí(_N):"
 
-#: ../filter/e-filter-rule.c:808
+#: ../filter/e-filter-rule.c:919
 msgid "A_dd Condition"
 msgstr "ìê ìê(_D)"
 
-#: ../filter/e-filter-rule.c:1162 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:306
+#: ../filter/e-filter-rule.c:1236 ../filter/filter.ui.h:1
+#: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "ëë ëì"
 
-#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:307
+#: ../filter/e-filter-rule.c:1236 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "ëëë ëì"
 
@@ -10642,7 +10241,7 @@ msgstr "&quot;{0}&quot; ìêìì íëìëë."
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "&quot;{1}&quot; ìêìì ìíìí ì ììëë."
 
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "ìëì ëììëë."
 
@@ -10670,10 +10269,14 @@ msgstr "ììíë ìê"
 msgid "a time relative to the current time"
 msgstr "íì ìêêìì ìëìì ìê"
 
-#: ../filter/filter.ui.h:5
+#: ../filter/filter.ui.h:5 ../mail/mail-config.ui.h:78
 msgid "seconds"
 msgstr "ì"
 
+#: ../filter/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "ì"
+
 #: ../filter/filter.ui.h:10
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
@@ -10695,7 +10298,7 @@ msgstr "ììë"
 msgid "Show filters for mail:"
 msgstr "ëì ëìì ëí íí íì:"
 
-#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:165
+#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:166
 msgid "_Filter Rules"
 msgstr "íí êì(_F)"
 
@@ -10727,156 +10330,145 @@ msgstr ""
 "ííëíë ìêêì ìëë ìëëë êììë\n"
 "ëìì ìêì ëêíëë."
 
+#: ../libemail-engine/e-mail-authenticator.c:182
+#, c-format
+msgid "Invalid authentication result code (%d)"
+msgstr "ìì êê ìëê ìëëììëë(%d)"
+
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/e-mail-folder-utils.c:109
+#: ../libemail-engine/e-mail-folder-utils.c:112
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "ëììë '%s' íëì ììíë ì"
 
-#: ../libemail-engine/e-mail-folder-utils.c:270
+#: ../libemail-engine/e-mail-folder-utils.c:565
 msgid "Forwarded messages"
 msgstr "ìëí ëìì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/e-mail-folder-utils.c:378
-#: ../libemail-engine/e-mail-folder-utils.c:627
+#: ../libemail-engine/e-mail-folder-utils.c:675
+#: ../libemail-engine/e-mail-folder-utils.c:926
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ëìì %dêë êììë ì"
 
 # tooltip
-#: ../libemail-engine/e-mail-folder-utils.c:472
+#: ../libemail-engine/e-mail-folder-utils.c:769
 msgid "Scanning messages for duplicates"
 msgstr "ìëë ëììë êìíë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/e-mail-folder-utils.c:875
+#: ../libemail-engine/e-mail-folder-utils.c:1177
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "'%s' íëë ìêíë ì"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1009
+#: ../libemail-engine/e-mail-folder-utils.c:1314
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "\"%s\" íìì ìêíìëë."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1013
+#: ../libemail-engine/e-mail-folder-utils.c:1318
 msgid "File has been removed."
 msgstr "íìì ìêíìëë."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1072
+#: ../libemail-engine/e-mail-folder-utils.c:1377
 msgid "Removing attachments"
 msgstr "ìëë ìê."
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/e-mail-folder-utils.c:1234
+#: ../libemail-engine/e-mail-folder-utils.c:1541
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ëìì %dêë ììíë ì"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1588 ../mail/em-folder-utils.c:624
+#: ../libemail-engine/e-mail-folder-utils.c:1897 ../mail/em-folder-utils.c:613
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "ìëë íë URI '%s'"
 
-#: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:719
-#: ../modules/mail/e-mail-shell-view-private.c:1095
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-properties.c:333
+#: ../mail/em-folder-tree-model.c:765
+#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1045
 msgid "Inbox"
 msgstr "ëì íìí"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:712
-#: ../modules/mail/e-mail-shell-view-private.c:1093
+#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:758
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 msgid "Drafts"
 msgstr "ìì ëêí"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:723
-#: ../modules/mail/e-mail-shell-view-private.c:1097
+#: ../libemail-engine/e-mail-session.c:118 ../mail/em-folder-tree-model.c:769
+#: ../modules/mail/e-mail-shell-view-private.c:1036
 msgid "Outbox"
 msgstr "ëë íìí"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-tree-model.c:727
-#: ../modules/mail/e-mail-shell-view-private.c:1099
+#: ../libemail-engine/e-mail-session.c:119 ../mail/em-folder-tree-model.c:773
+#: ../modules/mail/e-mail-shell-view-private.c:1038
 msgid "Sent"
 msgstr "ëë íìí"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1041 ../plugins/templates/templates.c:1341
-#: ../plugins/templates/templates.c:1351
+#: ../plugins/templates/templates.c:1048 ../plugins/templates/templates.c:1345
+#: ../plugins/templates/templates.c:1355
 msgid "Templates"
 msgstr "ìì"
 
-#: ../libemail-engine/e-mail-session.c:697 ../mail/mail-vfolder-ui.c:79
-msgid "Search Folders"
-msgstr "êì íë"
-
-#: ../libemail-engine/e-mail-session.c:975
+#: ../libemail-engine/e-mail-session.c:1319
 #, c-format
-msgid "Enter Passphrase for %s"
-msgstr "%sì ìíë ìëíììì"
-
-#: ../libemail-engine/e-mail-session.c:979
-msgid "Enter Passphrase"
-msgstr "ìí ìë"
+msgid "User cancelled operation"
+msgstr "ìììê ììí ëì"
 
-#: ../libemail-engine/e-mail-session.c:983
+#: ../libemail-engine/e-mail-session.c:1489
 #, c-format
-msgid "Enter Password for %s"
-msgstr "%sì ìíë ìëíììì"
-
-#: ../libemail-engine/e-mail-session.c:987
-msgid "Enter Password"
-msgstr "ìí ìë"
+msgid "%s authentication failed"
+msgstr "%s ìì ìí"
 
-#: ../libemail-engine/e-mail-session.c:1038
+#: ../libemail-engine/e-mail-session.c:1534
 #, c-format
-msgid "User canceled operation."
-msgstr "ìììê ììí ëì."
+msgid "No data source found for UID '%s'"
+msgstr "UID '%s'ì ëí ëìí ììê ììëë"
 
-#: ../libemail-engine/e-mail-session.c:1157
+#: ../libemail-engine/e-mail-session.c:1585
 #, c-format
 msgid ""
-"No destination address provided, forward of the message has been cancelled."
+"No destination address provided, forwarding of the message has been "
+"cancelled."
 msgstr "ëì ììë ìëíì ìììëë ëìì ìëì ììíëë."
 
-#: ../libemail-engine/e-mail-session.c:1166
+#: ../libemail-engine/e-mail-session.c:1598
 #, c-format
-msgid "No account found to use, forward of the message has been cancelled."
+msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "ììí êìì ììëë ëìì ìëì ììíëë."
 
-#: ../libemail-engine/e-mail-session.c:1320
-#, c-format
-msgid "%s authentication failed"
-msgstr "%s ìì ìí"
-
-#: ../libemail-engine/e-mail-session.c:1394
+#: ../libemail-engine/e-mail-session-utils.c:540
 #, c-format
-msgid "No password was provided"
-msgstr "ìíë ììíì ìììëë"
+msgid "No mail service found with UID '%s'"
+msgstr "UID '%s'ì ëì ìëìê ììëë"
 
-#: ../libemail-engine/e-mail-session-utils.c:416
+#: ../libemail-engine/e-mail-session-utils.c:549
 #, c-format
-msgid "Cannot get transport for account '%s'"
-msgstr "êì '%s'ì íëìííë êìì ì ììëë"
+msgid "UID '%s' is not a mail transport"
+msgstr "UID '%s'ì(ë) ëì ìì ìëì ìëëë"
 
-#: ../libemail-engine/e-mail-session-utils.c:505
-#: ../libemail-engine/mail-ops.c:616
+#: ../libemail-engine/e-mail-session-utils.c:641
+#: ../libemail-engine/mail-ops.c:698
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ëêë ííë ììíëë ìííìëë: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:531
-#: ../libemail-engine/e-mail-session-utils.c:565
-#: ../libemail-engine/mail-ops.c:635 ../libemail-engine/mail-ops.c:671
+#: ../libemail-engine/e-mail-session-utils.c:670
+#: ../libemail-engine/e-mail-session-utils.c:704
+#: ../libemail-engine/mail-ops.c:715 ../libemail-engine/mail-ops.c:751
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -10885,159 +10477,133 @@ msgstr ""
 "%sì ìêíëë ìííìëë: %s\n"
 "ëìì ëìì 'ëë íìí'ì ìêíëë."
 
-#: ../libemail-engine/e-mail-session-utils.c:585
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/e-mail-session-utils.c:724
+#: ../libemail-engine/mail-ops.c:773
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ëìì 'ëë íìí' íëì ìêíëë ìííìëë: %s"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/e-mail-session-utils.c:795
-#: ../libemail-engine/mail-ops.c:821 ../libemail-engine/mail-ops.c:922
+#: ../libemail-engine/e-mail-session-utils.c:954
+#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
 msgid "Sending message"
 msgstr "ëìì ëëë ììëë"
 
-#: ../libemail-engine/e-mail-session-utils.c:869
-#, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "'%s' íëë êë íìíë ììëë"
-
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/e-mail-store-utils.c:169
+#: ../libemail-engine/e-mail-store-utils.c:171
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "'%s'ìì ìê ëë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/e-mail-store-utils.c:260
+#: ../libemail-engine/e-mail-store-utils.c:263
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "'%s'ì ëì ìêíë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/e-mail-store-utils.c:335
+#: ../libemail-engine/e-mail-store-utils.c:340
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' ìê ìì ìí êìì ìë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-folder-cache.c:882
+#: ../libemail-engine/mail-folder-cache.c:885
 #, c-format
 msgid "Pinging %s"
 msgstr "\"%s\" ìêì íìíë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:87
+#: ../libemail-engine/mail-ops.c:94
 msgid "Filtering Selected Messages"
 msgstr "ìíí ëìì ííëíë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:209
+#: ../libemail-engine/mail-ops.c:216
 msgid "Fetching Mail"
 msgstr "ëì êììë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:832
+#: ../libemail-engine/mail-ops.c:916
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$dê ììì %1$dëì ëììë ëëë ì"
 
-#. Translators: The string is distinguished by total
-#. * count of messages to be sent.  Failed messages is
-#. * always more than zero.
-#: ../libemail-engine/mail-ops.c:883
+#: ../libemail-engine/mail-ops.c:968
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "%2$dê ì %1$dëì ëììë ëëëë ìííìëë"
 
-#: ../libemail-engine/mail-ops.c:889 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:974
 msgid "Canceled."
 msgstr "ììí."
 
-#: ../libemail-engine/mail-ops.c:891 ../mail/mail-send-recv.c:887
+#: ../libemail-engine/mail-ops.c:976
 msgid "Complete."
 msgstr "ìë."
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:1003
+#: ../libemail-engine/mail-ops.c:1088
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "ëììëì '%s'ì ìêë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:1004
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "ëììëì '%s'ì ëìíë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:1121
+#: ../libemail-engine/mail-ops.c:1207
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' íëë ììíë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:1194
+#: ../libemail-engine/mail-ops.c:1281
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "êì '%s'ì ìì ëììë ëìê ëìì ììíë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:1195
+#: ../libemail-engine/mail-ops.c:1282
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s êìì ììíë ì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:1257
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "'%s' íë ìë êìë ì"
-
-# ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:1475
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "'%s' íëì ìì ëììë ëìë ì"
-
-# ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:1568
+#: ../libemail-engine/mail-ops.c:1356
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ìì íìíì ëìë ì"
 
-# ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../libemail-engine/mail-ops.c:1664
-#, c-format
-msgid "Disconnecting %s"
-msgstr "%sìì ìê ëê"
-
 #: ../libemail-engine/mail-tools.c:71
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "ìí ëëíë '%s'ì(ë) ëë ì ììëë: %s"
 
-#: ../libemail-engine/mail-tools.c:112
+#: ../libemail-engine/mail-tools.c:111
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "mboxê ìë ìì '%s'ìì ëì ìêêë ìëíìëë"
 
-#: ../libemail-engine/mail-tools.c:224
+#: ../libemail-engine/mail-tools.c:229
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ìëí ëìì - %s"
 
-#: ../libemail-engine/mail-tools.c:226
+#: ../libemail-engine/mail-tools.c:231
 msgid "Forwarded message"
 msgstr "ìëí ëìì"
 
-#: ../libemail-engine/mail-vfolder.c:77
+#: ../libemail-engine/mail-vfolder.c:130
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "êì íë ìì: %s"
 
-#: ../libemail-engine/mail-vfolder.c:214
+#: ../libemail-engine/mail-vfolder.c:283
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "'%s'ì ëí êì íëë ìëìííë ì - %s"
@@ -11047,7 +10613,7 @@ msgstr "'%s'ì ëí êì íëë ìëìííë ì - %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:554
+#: ../libemail-engine/mail-vfolder.c:648
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -11063,89 +10629,87 @@ msgstr[0] ""
 "ë:\n"
 "\"%s\""
 
-#: ../libemail-utils/e-signature.c:710
-msgid "Autogenerated"
-msgstr "ìëìë ëëê"
+#: ../mail/e-mail-account-manager.c:446
+msgid "_Restore Default"
+msgstr "êëê ëì(_R)"
 
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1660 ../widgets/misc/e-signature-combo-box.c:79
-msgctxt "mail-signature"
-msgid "None"
-msgstr "ìì"
+#: ../mail/e-mail-account-manager.c:459
+msgid "You can drag and drop account names to reorder them."
+msgstr "êì ìëì ëì ëìë ìë ììë ëê ì ììëë."
 
-#: ../mail/em-account-editor.c:1753
-msgid "Always"
-msgstr "íì"
+#: ../mail/e-mail-account-manager.c:504
+msgid "De_fault"
+msgstr "êëê(_F)"
 
-#: ../mail/em-account-editor.c:1754
-msgid "Ask for each message"
-msgstr "ëììëë ëìëê"
+#: ../mail/e-mail-account-tree-view.c:85
+#: ../modules/mail/em-composer-prefs.c:505
+#: ../modules/plugin-manager/evolution-plugin-manager.c:360
+#: ../plugins/publish-calendar/publish-calendar.c:864
+msgid "Enabled"
+msgstr "ìì"
 
-#: ../mail/em-account-editor.c:2921 ../mail/mail-config.ui.h:164
-msgid "_Path:"
-msgstr "êë(_P):"
+#: ../mail/e-mail-account-tree-view.c:109
+msgid "Account Name"
+msgstr "êì ìë"
 
-#: ../mail/em-account-editor.c:2924
-msgid "Fil_e:"
-msgstr "íì(_E):"
+#: ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-config-security-page.c:333
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3655
+#: ../mail/mail-config.ui.h:44
+msgid "Default"
+msgstr "êëê"
 
-#: ../mail/em-account-editor.c:2969
-msgid "Mail Configuration"
-msgstr "ëì ìì"
+#: ../mail/e-mail-autoconfig.c:194
+#, c-format
+msgid "No mail exchanger record for '%s'"
+msgstr "'%s'ì ëí ëì êí(MX) ëìëê ììëë"
 
-#: ../mail/em-account-editor.c:2970
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
-msgstr ""
-"ìëëì ëì ìì ëìëìëë.\n"
-"\n"
-"ììíëë \"êì\"ì ëëììì."
+#: ../mail/e-mail-autoconfig.c:201
+#, c-format
+msgid "Temporarily unable to resolve '%s'"
+msgstr "ììììë '%s'ì ììë ììë ì ììëë"
 
-#: ../mail/em-account-editor.c:2973
-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/e-mail-autoconfig.c:208
+#, c-format
+msgid "Error resolving '%s'"
+msgstr "'%s'ì ììë ììëë ì ìë"
 
-#: ../mail/em-account-editor.c:2975 ../mail/em-account-editor.c:3184
-msgid "Receiving Email"
-msgstr "ëì ëê"
+#: ../mail/e-mail-autoconfig.c:264
+#, c-format
+msgid "No authoritative name server for '%s'"
+msgstr "'%s'ì ëí ììí ëììëê ììëë"
 
-#: ../mail/em-account-editor.c:2976
-msgid "Please configure the following account settings."
-msgstr "ëì êì ììì íììì."
+#: ../mail/e-mail-autoconfig.c:661
+msgid "No email address provided"
+msgstr "ììëì ììë ìêíì ìì"
 
-#: ../mail/em-account-editor.c:2978 ../mail/em-account-editor.c:3803
-msgid "Sending Email"
-msgstr "ëì ëëê"
+#: ../mail/e-mail-autoconfig.c:670
+msgid "Missing domain in email address"
+msgstr "ììëì ììì ëëìì ìì"
 
-#: ../mail/em-account-editor.c:2979
-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/e-mail-backend.c:734
+msgid "Unknown background operation"
+msgstr "ì ì ìë ëêëìë ëì"
 
-#: ../mail/em-account-editor.c:2981
-msgid "Account Summary"
-msgstr "êì ìì"
+#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1418
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
+msgid "Close this window"
+msgstr "ì ìì ëìëë"
 
-#: ../mail/em-account-editor.c:2982
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
-msgstr "ëìì ëìì ìê ì ë ììí ìì ìììëë."
+#: ../mail/e-mail-browser.c:284
+msgid "(No Subject)"
+msgstr "(ìë ìì)"
 
-#: ../mail/em-account-editor.c:2986
-msgid "Done"
-msgstr "ìë"
+#: ../mail/e-mail-config-assistant.c:501
+msgid "Evolution Account Assistant"
+msgstr "ìëëì êì ëìë"
+
+#: ../mail/e-mail-config-auth-check.c:348
+msgid "Check for Supported Types"
+msgstr "ììíë ëì íì"
 
-#: ../mail/em-account-editor.c:2987
+#: ../mail/e-mail-config-confirm-page.c:157
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11159,133 +10723,379 @@ msgstr ""
 "\n"
 "ììì ììíëë \"ìì\"ì ëëììì."
 
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-account-editor.c:3550
-msgid "Check for _new messages every"
-msgstr "ì ëì íì(_N), ë"
+#: ../mail/e-mail-config-confirm-page.c:169
+msgid "Done"
+msgstr "ìë"
 
-#: ../mail/em-account-editor.c:3558
-msgid "minu_tes"
-msgstr "ë(_T)"
+#: ../mail/e-mail-config-defaults-page.c:539
+msgid "Special Folders"
+msgstr "íì íë"
 
-#: ../mail/em-account-editor.c:4276 ../mail/mail-config.ui.h:166
-msgid "Security"
-msgstr "ëì"
+#: ../mail/e-mail-config-defaults-page.c:548
+msgid "Draft Messages _Folder:"
+msgstr "ìì ëìì íë(_F):"
+
+#: ../mail/e-mail-config-defaults-page.c:558
+msgid "Choose a folder for saving draft messages."
+msgstr "ìì ëììë ììí íëë ìííììì."
+
+#: ../mail/e-mail-config-defaults-page.c:572
+msgid "Sent _Messages Folder:"
+msgstr "ëë ëìì íë(_M):"
+
+#: ../mail/e-mail-config-defaults-page.c:582
+msgid "Choose a folder for saving sent messages."
+msgstr "ëë ëììë ììí íëë ìííììì."
+
+#: ../mail/e-mail-config-defaults-page.c:596
+msgid "_Restore Defaults"
+msgstr "êëê ëì(_R)"
+
+#: ../mail/e-mail-config-defaults-page.c:610
+msgid "Use a Real Folder for _Trash:"
+msgstr "íìíìë ìì íë ìì(_T):"
+
+#: ../mail/e-mail-config-defaults-page.c:611
+msgid "Choose a folder for deleted messages."
+msgstr "ììí ëììì íëë ìííììì."
+
+#: ../mail/e-mail-config-defaults-page.c:620
+msgid "Use a Real Folder for _Junk:"
+msgstr "ìí ëìì ìëë ìì íë ìì(_J):"
+
+#: ../mail/e-mail-config-defaults-page.c:621
+msgid "Choose a folder for junk messages."
+msgstr "ìí ëììì íëë ìííììì."
+
+# ìí ìíê ìëë ìì ìì ìë, "~íë ì"ìë ëìíì ë ê
+#: ../mail/e-mail-config-defaults-page.c:638
+msgid "Composing Messages"
+msgstr "ëìì ìì"
+
+#: ../mail/e-mail-config-defaults-page.c:647
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "íì ìì(CC) (_S):"
+
+#: ../mail/e-mail-config-defaults-page.c:672
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "íì ìì ìì(BCC) (_B):"
+
+#: ../mail/e-mail-config-defaults-page.c:707
+msgid "Message Receipts"
+msgstr "ëìì ëì ìì íì"
+
+#: ../mail/e-mail-config-defaults-page.c:716
+msgid "S_end message receipts:"
+msgstr "ëìì ìì íì ëëê(_E):"
+
+#: ../mail/e-mail-config-defaults-page.c:741
+msgid "Never"
+msgstr "ìì ì í"
+
+#: ../mail/e-mail-config-defaults-page.c:747
+msgid "Always"
+msgstr "íì"
+
+#: ../mail/e-mail-config-defaults-page.c:753
+msgid "Ask for each message"
+msgstr "ëììëë ëìëê"
+
+#: ../mail/e-mail-config-defaults-page.c:824
+msgid "Defaults"
+msgstr "êëê"
+
+#: ../mail/e-mail-config-identity-page.c:254
+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/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-summary-page.c:324
+msgid "Account Information"
+msgstr "êì ìë"
+
+#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-summary-page.c:333
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example, \"Work\" or \"Personal\"."
+msgstr ""
+"ì êìì ì ìëì ìëíììì.\n"
+"ì: \"ììì\" ëë \"êìì\"."
+
+#: ../mail/e-mail-config-identity-page.c:299
+#: ../mail/e-mail-config-summary-page.c:341
+#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
+#: ../widgets/misc/e-mail-signature-script-dialog.c:417
+msgid "_Name:"
+msgstr "ìë(_N):"
+
+#: ../mail/e-mail-config-identity-page.c:336
+msgid "Required Information"
+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:4331 ../mail/em-account-editor.c:4433
+#: ../mail/e-mail-config-identity-page.c:345
+msgid "Full Nam_e:"
+msgstr "ìì ìë(_E):"
+
+#: ../mail/e-mail-config-identity-page.c:372
+msgid "Email _Address:"
+msgstr "ììëì ìì(_A):"
+
+#: ../mail/e-mail-config-identity-page.c:409
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "ìê ìë"
+
+#: ../mail/e-mail-config-identity-page.c:417
+msgid "Re_ply-To:"
+msgstr "íì ìì(_P):"
+
+#: ../mail/e-mail-config-identity-page.c:444
+msgid "Or_ganization:"
+msgstr "ìì(_G):"
+
+#: ../mail/e-mail-config-identity-page.c:499
+msgid "Add Ne_w Signature..."
+msgstr "ì ìë ìê(_W)..."
+
+#: ../mail/e-mail-config-identity-page.c:640
+msgid "Identity"
+msgstr "ìì ìë"
+
+#: ../mail/e-mail-config-lookup-page.c:68
+msgid "Looking up account details..."
+msgstr "êì ìì ìëë ììëë ì..."
+
+#: ../mail/e-mail-config-provider-page.c:485
+msgid "Checking for New Mail"
+msgstr "ì ëì íì"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/e-mail-config-provider-page.c:501
+msgid "Check for _new messages every"
+msgstr "ì ëì íì(_N), ë"
+
+#: ../mail/e-mail-config-provider-page.c:700
 msgid "Receiving Options"
 msgstr "ëê ìì"
 
-#: ../mail/em-account-editor.c:4332 ../mail/em-account-editor.c:4434
-msgid "Checking for New Messages"
-msgstr "ì ëì íì"
+#: ../mail/e-mail-config-receiving-page.c:50
+msgid "Receiving Email"
+msgstr "ëì ëê"
 
-#: ../mail/em-account-editor.c:4937
-msgid "Setup Google con_tacts with Evolution"
-msgstr "ìëëììì êê ìëì ìì(_T)"
+#: ../mail/e-mail-config-security-page.c:260
+#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/itip-formatter/plugin/config-ui.c:91
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "ìë"
 
-#: ../mail/em-account-editor.c:4944
-msgid "Setup Google ca_lendar with Evolution"
-msgstr "ìëëììì êê ëë ìì(_L)"
+#: ../mail/e-mail-config-security-page.c:268
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "ëì ììì ìëíì ìê(Outlook íí)(_D)"
 
-#: ../mail/em-account-editor.c:4992
-msgid "Setup _Yahoo calendar with Evolution"
-msgstr "ìëëììì ìí ëë ìì(_Y)"
+#: ../mail/e-mail-config-security-page.c:290
+msgid "Pretty Good Privacy (OpenPGP)"
+msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/em-account-editor.c:5017
-msgid "Yahoo Calen_dar name:"
-msgstr "ìí ëë ìë(_D):"
+#: ../mail/e-mail-config-security-page.c:298
+msgid "OpenPGP _Key ID:"
+msgstr "OpenPGP í ID(_K):"
 
-#: ../mail/e-mail-account-manager.c:405
-msgid "_Restore Default"
-msgstr "êëê ëì(_R)"
+#: ../mail/e-mail-config-security-page.c:320
+msgid "Si_gning algorithm:"
+msgstr "ìë ìêëì(_G):"
 
-#: ../mail/e-mail-account-manager.c:418
-msgid "You can drag and drop account names to reorder them."
-msgstr "êì ìëì ëì ëìë ìë ììë ëê ì ììëë."
+#: ../mail/e-mail-config-security-page.c:336
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+msgid "SHA1"
+msgstr "SHA1"
 
-#: ../mail/e-mail-account-manager.c:463
-msgid "De_fault"
-msgstr "êëê(_F)"
+#: ../mail/e-mail-config-security-page.c:339
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+msgid "SHA256"
+msgstr "SHA256"
 
-#: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:509
-#: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:855
-msgid "Enabled"
-msgstr "ìì"
+#: ../mail/e-mail-config-security-page.c:342
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+msgid "SHA384"
+msgstr "SHA384"
 
-#: ../mail/e-mail-account-tree-view.c:105
-msgid "Account Name"
-msgstr "êì ìë"
+#: ../mail/e-mail-config-security-page.c:345
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+msgid "SHA512"
+msgstr "SHA512"
 
-#. we changed user, thus reset the chosen calendar combo too, because
-#. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3439
-#: ../mail/mail-config.ui.h:51
-#: ../plugins/google-account-setup/google-source.c:311
-#: ../plugins/google-account-setup/google-source.c:553
-#: ../plugins/google-account-setup/google-source.c:690
-msgid "Default"
-msgstr "êëê"
+#: ../mail/e-mail-config-security-page.c:361
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "ì êììë ëëë ëììë íì ìë(_W)"
 
-#: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:176
-#: ../widgets/misc/e-attachment-paned.c:181
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "ìë"
+#: ../mail/e-mail-config-security-page.c:373
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "ìííí ëìì ëë ë ììì ëíì ììë ìíí(_M)"
 
-#: ../mail/e-mail-attachment-bar.c:619
-#: ../widgets/misc/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "ììì ëê"
+#: ../mail/e-mail-config-security-page.c:385
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "ìííí ë ë í ëìì ëì ìë íë ììë ìë(_T)"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:705
-msgid "List View"
-msgstr "ëë ëê"
+#: ../mail/e-mail-config-security-page.c:409
+msgid "Secure MIME (S/MIME)"
+msgstr "ëì MIME (S/MIME)"
 
-#: ../mail/e-mail-backend.c:661
-msgid "Unknown background operation"
-msgstr "ì ì ìë ëêëìë ëì"
+#: ../mail/e-mail-config-security-page.c:417
+msgid "Sig_ning certificate:"
+msgstr "ìë ììì(_N):"
 
-#: ../mail/e-mail-browser.c:130 ../shell/e-shell-window-actions.c:1439
-#: ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-msgid "Close this window"
-msgstr "ì ìì ëìëë"
+#: ../mail/e-mail-config-security-page.c:441
+#: ../mail/e-mail-config-security-page.c:547
+msgid "Select"
+msgstr "ìí"
 
-#: ../mail/e-mail-browser.c:289
-msgid "(No Subject)"
-msgstr "(ìë ìì)"
+#: ../mail/e-mail-config-security-page.c:459
+msgid "Signing _algorithm:"
+msgstr "ìë ìêëì(_A):"
+
+#: ../mail/e-mail-config-security-page.c:500
+msgid "Always sign outgoing messages when using this account"
+msgstr "ì êììë ëëë ëììë íì ìë"
+
+#: ../mail/e-mail-config-security-page.c:523
+msgid "Encryption certificate:"
+msgstr "ìíí ììì:"
+
+#: ../mail/e-mail-config-security-page.c:565
+msgid "Always encrypt outgoing messages when using this account"
+msgstr "ì êììë ëëë ëììë íì ìíí"
+
+#: ../mail/e-mail-config-security-page.c:585
+msgid "Always encrypt to myself when sending encrypted messages"
+msgstr "ìííí ëìì ëë ë ììì ëíì ììë ìíí"
+
+#: ../mail/e-mail-config-sending-page.c:50
+msgid "Sending Email"
+msgstr "ëì ëëê"
+
+#: ../mail/e-mail-config-service-page.c:640
+msgid "Server _Type:"
+msgstr "ìë ìë(_T):"
+
+#: ../mail/e-mail-config-summary-page.c:142
+msgid "SSL"
+msgstr "SSL"
+
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "TLS"
+msgstr "TLS"
+
+#: ../mail/e-mail-config-summary-page.c:307
+msgid ""
+"This is a summary of the settings which will be used to access your mail."
+msgstr "ëìì ëìì ìê ì ë ììí ìì ìììëë."
+
+#: ../mail/e-mail-config-summary-page.c:372
+msgid "Personal Details"
+msgstr "êì ìì ìë"
+
+#: ../mail/e-mail-config-summary-page.c:381
+msgid "Full Name:"
+msgstr "ìì ìë:"
+
+#: ../mail/e-mail-config-summary-page.c:395
+msgid "Email Address:"
+msgstr "ììëì ìì:"
+
+# ìì tab, ìíê ìë
+#: ../mail/e-mail-config-summary-page.c:409
+msgid "Receiving"
+msgstr "ëê"
+
+# ìì tab, ìíê ìë
+#: ../mail/e-mail-config-summary-page.c:421
+msgid "Sending"
+msgstr "ëëê"
+
+#: ../mail/e-mail-config-summary-page.c:433
+msgid "Server Type:"
+msgstr "ìë ìë:"
+
+#: ../mail/e-mail-config-summary-page.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
+msgid "Server:"
+msgstr "ìë:"
+
+#: ../mail/e-mail-config-summary-page.c:475
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+msgid "Username:"
+msgstr "ììììë:"
 
-#: ../mail/e-mail-display.c:68
+#: ../mail/e-mail-config-summary-page.c:496
+msgid "Security:"
+msgstr "ëì:"
+
+#: ../mail/e-mail-config-summary-page.c:787
+msgid "Account Summary"
+msgstr "êì ìì"
+
+#: ../mail/e-mail-config-welcome-page.c:157
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"ìëëì ëì ìì ëìëìëë.\n"
+"\n"
+"ììíëë \"êì\"ì ëëììì."
+
+#: ../mail/e-mail-config-welcome-page.c:167
+#: ../modules/startup-wizard/e-startup-assistant.c:150
+msgid "Welcome"
+msgstr "íìíëë"
+
+#: ../mail/e-mail-config-window.c:329
+msgid "Account Editor"
+msgstr "êì íìê"
+
+#: ../mail/e-mail-display.c:119
 msgid "_Add to Address Book..."
 msgstr "ììëì ìê(_A)..."
 
-#: ../mail/e-mail-display.c:75
+#: ../mail/e-mail-display.c:126
 msgid "_To This Address"
 msgstr "ì ììë(_T)"
 
-#: ../mail/e-mail-display.c:82
+#: ../mail/e-mail-display.c:133
 msgid "_From This Address"
 msgstr "ì ìììì(_F)"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:140
 msgid "Send _Reply To..."
 msgstr "íì ëëê(_R)..."
 
-#: ../mail/e-mail-display.c:91
+#: ../mail/e-mail-display.c:142
 msgid "Send a reply message to this address"
 msgstr "íì ëììë ì ììë ëëëë"
 
-#: ../mail/e-mail-display.c:98
+#: ../mail/e-mail-display.c:149
 msgid "Create Search _Folder"
 msgstr "êì íë ëëê(_F)"
 
+#: ../mail/e-mail-display.c:159
+msgid "Save _Image..."
+msgstr "êë ìì(_I)..."
+
+#: ../mail/e-mail-display.c:161
+msgid "Save the image to a file"
+msgstr "êëì íìì ììíëë"
+
 #. 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
@@ -11321,7 +11131,7 @@ msgid "_Later"
 msgstr "ëìì(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:736
+#: ../modules/mail/e-mail-shell-view-actions.c:718
 msgid "Add Label"
 msgstr "ëìë ìê"
 
@@ -11341,704 +11151,735 @@ msgstr ""
 msgid "Color"
 msgstr "ì"
 
-#: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../plugins/caldav/caldav-browse-server.c:1359
-#: ../widgets/menus/gal-define-views-dialog.c:352
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
-msgid "Name"
-msgstr "ìë"
-
-#: ../mail/e-mail-migrate.c:1269
+#: ../mail/e-mail-migrate.c:332
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "'%s'ì ëì ëì íëë ëë ì ììëë: %s"
 
-#: ../mail/e-mail-notebook-view.c:627
+#: ../mail/e-mail-notebook-view.c:269
 msgid "Please select a folder"
 msgstr "íëë ìííììì"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-printer.c:124
+#, c-format
+msgid "Page %d of %d"
+msgstr "%2$díìì ì %1$díìì"
+
+#: ../mail/e-mail-printer.c:549
+#: ../modules/calendar/e-cal-shell-view-actions.c:217
+#: ../modules/calendar/e-cal-shell-view-actions.c:246
+msgid "Print"
+msgstr "ìì"
+
+#: ../mail/e-mail-printer.c:555
+msgid "Header Name"
+msgstr "íë ìë"
+
+#: ../mail/e-mail-printer.c:561
+msgid "Header Value"
+msgstr "íë ê"
+
+#: ../mail/e-mail-printer.c:615 ../mail/mail-config.ui.h:102
+msgid "Headers"
+msgstr "íë"
+
+#: ../mail/e-mail-reader.c:349
+msgid "Save Image"
+msgstr "êë ìì"
+
+#: ../mail/e-mail-reader.c:431 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "íëë ëì"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:431 ../mail/em-folder-utils.c:492
 msgid "C_opy"
 msgstr "ëì(_O)"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "íëë ìë"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:492
 msgid "_Move"
 msgstr "ìë(_M)"
 
 # ìì: check buttonì ìì. ëììë ëìíì ë ê.
 # ìì: ìë ìëìëë ì ìë.
-#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1313 ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1535
 msgid "_Do not ask me again."
 msgstr "ëì ëì ìê(_D)"
 
 # ìì: check buttonì ìì. ëììë ëìíì ë ê.
 # ìì: ìë ìëìëë ì ìë.
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1541
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "ëìë ëìíì êì Reply-To: ëì(_A)"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1726
+msgid "Failed to retrieve message:"
+msgstr "ëììë êììëë ìííìëë:"
+
+# ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
+#: ../mail/e-mail-reader.c:1772 ../mail/e-mail-reader.c:2862
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "'%s' ëììë êììë ì"
+
+#: ../mail/e-mail-reader.c:1949
 msgid "A_dd Sender to Address Book"
 msgstr "ëë ìëì ììëì ìê(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1951
 msgid "Add sender to address book"
 msgstr "ëë ìëì ììëì ìêíëë"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1956
 msgid "Check for _Junk"
 msgstr "ìíëì êì(_J)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1958
 msgid "Filter the selected messages for junk status"
 msgstr "ìíí ëììë ìíëììì ííëíëë"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1963
 msgid "_Copy to Folder..."
 msgstr "íëë ëì(_C)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1965
 msgid "Copy selected messages to another folder"
 msgstr "ìíí ëììë ëë íëë ëìíëë"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1970
 msgid "_Delete Message"
 msgstr "ëìì ìì(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1972
 msgid "Mark the selected messages for deletion"
 msgstr "ìíí ëììë ìì êìë íìíëë"
 
-#: ../mail/e-mail-reader.c:1823
-msgid "Filter on Mailing _List..."
-msgstr "ëìë ëìíìëí íí(_L)..."
+#: ../mail/e-mail-reader.c:1977
+msgid "Create a Filter Rule for Mailing _List..."
+msgstr "ëìë ëìíì ëí íí êì ëëê(_L)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1979
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ì ëìë ëìíìê ëë ëììë íí êììë ëëëë"
 
-#: ../mail/e-mail-reader.c:1830
-msgid "Filter on _Recipients..."
-msgstr "ëë ìëì ëí íí(_R)..."
+#: ../mail/e-mail-reader.c:1984
+msgid "Create a Filter Rule for _Recipients..."
+msgstr "ëë ìëì ëí íí êì ëëê(_R)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1986
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ì ëë ìëìê ëë ëììë íí êììë ëëëë"
 
-#: ../mail/e-mail-reader.c:1837
-msgid "Filter on Se_nder..."
-msgstr "ëë ìëì ëí íí(_N)..."
+#: ../mail/e-mail-reader.c:1991
+msgid "Create a Filter Rule for Se_nder..."
+msgstr "ëë ìëì ëí íí êì ëëê(_N)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1993
 msgid "Create a rule to filter messages from this sender"
 msgstr "ì ëë ìëì ëë ëììë íí êììë ëëëë"
 
-#: ../mail/e-mail-reader.c:1844
-msgid "Filter on _Subject..."
-msgstr "ìëì ëí íí(_S)..."
+#: ../mail/e-mail-reader.c:1998
+msgid "Create a Filter Rule for _Subject..."
+msgstr "ìëì ëí íí êì ëëê(_S)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:2000
 msgid "Create a rule to filter messages with this subject"
 msgstr "ì ìëìë ëìí ëììë íí êììë ëëëë"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:2005
 msgid "A_pply Filters"
 msgstr "íí ìì(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:2007
 msgid "Apply filter rules to the selected messages"
 msgstr "ìíí ëììì íí êìì ììíëë"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:2012
 msgid "_Find in Message..."
 msgstr "ëìììì ìê(_F)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:2014
 msgid "Search for text in the body of the displayed message"
 msgstr "íìí ëììì ëëìì íìíë ììëë"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:2019
 msgid "_Clear Flag"
 msgstr "íëê ììê(_C)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:2021
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "ìíí ëìììì ìê ìì íëêë ììëë"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:2026
 msgid "_Flag Completed"
 msgstr "íëê ìë(_F)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:2028
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ìíí ëììì ìê ììì ëììë íìíëë"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:2033
 msgid "Follow _Up..."
 msgstr "ìê ìì(_U)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:2035
 msgid "Flag the selected messages for follow-up"
 msgstr "ìíí ëììì ìê ììì íìíëë"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2040
 msgid "_Attached"
 msgstr "ìë(_A)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:2042 ../mail/e-mail-reader.c:2049
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ìíí ëììë ëë ìëìê ìëíì ìëíëë"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2047
 msgid "Forward As _Attached"
 msgstr "ìëë ìë(_A)"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2054
 msgid "_Inline"
 msgstr "íí(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1902 ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:2056 ../mail/e-mail-reader.c:2063
 msgid "Forward the selected message in the body of a new message"
 msgstr "ìíí ëììë ì ëììì ëëìë ìëíëë"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2061
 msgid "Forward As _Inline"
 msgstr "íííì ìë(_I)"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2068
 msgid "_Quoted"
 msgstr "ìì(_Q)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1916 ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:2070 ../mail/e-mail-reader.c:2077
 msgid "Forward the selected message quoted like a reply"
 msgstr "ìíí ëììë íììë ììíì ìëíëë"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2075
 msgid "Forward As _Quoted"
 msgstr "ììíì ìë(_Q)"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2082
 msgid "_Load Images"
 msgstr "êë ììëìê(_L)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2084
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML ëìì êëì êìë ììëìëë"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2089
 msgid "_Important"
 msgstr "ìì(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2091
 msgid "Mark the selected messages as important"
 msgstr "ìíí ëììë ììí êìë íìíëë"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2096
 msgid "_Junk"
 msgstr "ìíëì(_J)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2098
 msgid "Mark the selected messages as junk"
 msgstr "ìíí ëììë ìíëìë íìíëë"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2103
 msgid "_Not Junk"
 msgstr "ìíëì ìë(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2105
 msgid "Mark the selected messages as not being junk"
 msgstr "ìíí ëììë ìíëìì ìë êìë íìíëë"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2110
 msgid "_Read"
 msgstr "ìê(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2112
 msgid "Mark the selected messages as having been read"
 msgstr "ìíí ëììë ìì êìë íìíëë"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2117
 msgid "Uni_mportant"
 msgstr "ììíì ìì(_M)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2119
 msgid "Mark the selected messages as unimportant"
 msgstr "ìíí ëììë ììíì ìì êìë íìíëë"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2124
 msgid "_Unread"
 msgstr "ìê ìì(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2126
 msgid "Mark the selected messages as not having been read"
 msgstr "ìíí ëììë ìì ìì êìë íìíëë"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2131
 msgid "_Edit as New Message..."
 msgstr "ì ëììë íì(_E)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2133
 msgid "Open the selected messages in the composer for editing"
 msgstr "ìíí ëììë ëì ìììì ììì íìíëë"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2138
 msgid "Compose _New Message"
 msgstr "ì ëìì ìì(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2140
 msgid "Open a window for composing a mail message"
 msgstr "ëì ëììë ììíë ìì ìëë"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2145
 msgid "_Open in New Window"
 msgstr "ì ììì ìê(_O)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2147
 msgid "Open the selected messages in a new window"
 msgstr "ìíí ëììë ì ììì ìëë"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2152
 msgid "_Move to Folder..."
 msgstr "íëë ìë(_M)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2154
 msgid "Move selected messages to another folder"
 msgstr "ìíí ëììë ëë íëë ìêëë"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2159
 msgid "_Switch to Folder"
 msgstr "íëë ìë(_S)"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2161
 msgid "Display the parent folder"
 msgstr "ìì íë íì"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2166
 msgid "Switch to _next tab"
 msgstr "ëì íìë ìë(_N)"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2168
 msgid "Switch to the next tab"
 msgstr "ëì íìë ìëíëë"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2173
 msgid "Switch to _previous tab"
 msgstr "ìì íìë ìë(_P)"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2175
 msgid "Switch to the previous tab"
 msgstr "ìì íìë ìëíëë"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2180
 msgid "Cl_ose current tab"
 msgstr "íì í ëê(_O)"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2182
 msgid "Close current tab"
 msgstr "íì íì ëìëë"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2187
 msgid "_Next Message"
 msgstr "ëì ëìì(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2189
 msgid "Display the next message"
 msgstr "ëìì ëììë íìíëë"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2194
 msgid "Next _Important Message"
 msgstr "ëì ììí ëìì(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2196
 msgid "Display the next important message"
 msgstr "ëìì ììí ëììë íìíëë"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2201
 msgid "Next _Thread"
 msgstr "ëì êíë(_T)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2203
 msgid "Display the next thread"
 msgstr "ëìì êíëë íìíëë"
 
 # ìì: ìëì Previous Unread Messageì êì ííë ëì
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2208
 msgid "Next _Unread Message"
 msgstr "ìì ìì ëì ëìì(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2210
 msgid "Display the next unread message"
 msgstr "ëìì ìì ìì ëììë íìíëë"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2215
 msgid "_Previous Message"
 msgstr "ìì ëìì(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2217
 msgid "Display the previous message"
 msgstr "ììì ëììë íìíëë"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2222
 msgid "Pr_evious Important Message"
 msgstr "ììì ììí ëìì(_E)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2224
 msgid "Display the previous important message"
 msgstr "ììì ììí ëììë íìíëë"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2229
 msgid "Previous T_hread"
 msgstr "ìì êíë(_H)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2231
 msgid "Display the previous thread"
 msgstr "ìì ëììë íìíëë"
 
 # ìì: ìì Next Unread Messageì êì ííë ëì
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2236
 msgid "P_revious Unread Message"
 msgstr "ìì ìì ìì ëìì(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2238
 msgid "Display the previous unread message"
 msgstr "ììì ìì ìì ëììë íìíëë"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2245
 msgid "Print this message"
 msgstr "ì ëììë ììíëë"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2252
 msgid "Preview the message to be printed"
 msgstr "ììí ëììë ëë ëëë"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2257
 msgid "Re_direct"
 msgstr "ììë ëê(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2259
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "ìíí ëììì ìììë ëêêë ëêíëë (ëìíëë)"
+msgstr "ìíí ëììì ìììë ëêêë ëëëë(ëìíëë)"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2264
 msgid "Remo_ve Attachments"
 msgstr "ìë ìê(_V)"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2266
 msgid "Remove attachments"
 msgstr "ìë ìê"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2271
 msgid "Remove Du_plicate Messages"
 msgstr "ìë ëìì ìê(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2273
 msgid "Checks selected messages for duplicates"
 msgstr "ìíí ëììë ìëìë íìíëë"
 
-#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:181
+#: ../mail/e-mail-reader.c:2278 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1574
+#: ../modules/mail/e-mail-attachment-handler.c:182
 msgid "Reply to _All"
 msgstr "ììì íì(_A)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2280
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "ìíí ëììì ëë ìë ëëìê íìì ììíëë"
 
 # Listë ëìë ëìíë ëí.
-#: ../mail/e-mail-reader.c:2131 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2285 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "ëìíì íì(_L)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2287
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "ìíí ëììì ëìë ëìíë íìì ììíëë"
 
-#: ../mail/e-mail-reader.c:2138
-#: ../modules/mail/e-mail-attachment-handler.c:188
+#: ../mail/e-mail-reader.c:2292
+#: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Reply to Sender"
 msgstr "ëë ìëìê íì(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2294
 msgid "Compose a reply to the sender of the selected message"
 msgstr "ì ëììë ëëìëìê íìì ììíëë"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2299
 msgid "_Save as mbox..."
 msgstr "ëìíìë ìì(_S)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2301
 msgid "Save selected messages as an mbox file"
-msgstr "ìíí ëììë ëìí (mbox) íìë ììíëë"
+msgstr "ìíí ëììë ëìí(mbox) íìë ììíëë"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2306
 msgid "_Message Source"
 msgstr "ëìì ìë(_M)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2308
 msgid "Show the raw email source of the message"
-msgstr "ëììì ëì ììë íìíëë"
+msgstr "ëììì ëì ìëì íìíëë"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2320
 msgid "_Undelete Message"
 msgstr "ëìì ëìëê(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2322
 msgid "Undelete the selected messages"
 msgstr "ìíí ëììë ëìëëë"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2327
 msgid "_Normal Size"
 msgstr "ëí íê(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2329
 msgid "Reset the text to its original size"
 msgstr "êìë ìë íêë ëìëë"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2334
 msgid "_Zoom In"
 msgstr "íë(_Z)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2336
 msgid "Increase the text size"
 msgstr "êì íêë íìëë"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2341
 msgid "Zoom _Out"
 msgstr "ìì(_O)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2343
 msgid "Decrease the text size"
 msgstr "êì íêë ììëë"
 
-#: ../mail/e-mail-reader.c:2196
-msgid "Create R_ule"
-msgstr "êì ëëê(_U)"
+#: ../mail/e-mail-reader.c:2350
+msgid "Cre_ate"
+msgstr "ëëê(_A)"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2357
 msgid "Ch_aracter Encoding"
 msgstr "ëì ììë(_A)"
 
 # inline, attached, quoted ëì
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2364
 msgid "F_orward As"
 msgstr "ìë ëì(_O)"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2371
 msgid "_Group Reply"
 msgstr "êë íì(_G)"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2378
 msgid "_Go To"
 msgstr "ìë(_G)"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2385
 msgid "Mar_k As"
 msgstr "íì(_K)"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2392
 msgid "_Message"
 msgstr "ëìì(_M)"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2399
 msgid "_Zoom"
 msgstr "íë/ìì(_Z)"
 
-#: ../mail/e-mail-reader.c:2255
-msgid "Search Folder from Mailing _List..."
-msgstr "ëìë ëìíì ëí êì íë(_L)..."
+#: ../mail/e-mail-reader.c:2409
+msgid "Create a Search Folder from Mailing _List..."
+msgstr "ëìë ëìíì ëí êì íë ëëê(_L)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2411
 msgid "Create a search folder for this mailing list"
 msgstr "ì ëìë ëìíì ëí êì íëë ëëëë"
 
-#: ../mail/e-mail-reader.c:2262
-msgid "Search Folder from Recipien_ts..."
-msgstr "ëë ìëì ëí êì íë(_T)..."
+#: ../mail/e-mail-reader.c:2416
+msgid "Create a Search Folder from Recipien_ts..."
+msgstr "ëë ìëì ëí êì íë ëëê(_T)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2418
 msgid "Create a search folder for these recipients"
 msgstr "ì ëë ìëì ëí êì íëë ëëëë"
 
-#: ../mail/e-mail-reader.c:2269
-msgid "Search Folder from Sen_der..."
-msgstr "ëë ìëì ëí êì íë(_D)..."
+#: ../mail/e-mail-reader.c:2423
+msgid "Create a Search Folder from Sen_der..."
+msgstr "ëë ìëì ëí êì íë ëëê(_D)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2425
 msgid "Create a search folder for this sender"
 msgstr "ì ëë ìëì ëí êì íëë ëëëë"
 
-#: ../mail/e-mail-reader.c:2276
-msgid "Search Folder from S_ubject..."
-msgstr "ìëì ëí êì íë(_U)..."
+#: ../mail/e-mail-reader.c:2430
+msgid "Create a Search Folder from S_ubject..."
+msgstr "ìëì ëí êì íë ëëê(_U)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2432
 msgid "Create a search folder for this subject"
 msgstr "ì ìëì ëí êì íëë ëëëë"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark for Follo_w Up..."
 msgstr "ìê ìììë íì(_W)..."
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2463
 msgid "Mark as _Important"
 msgstr "ììí êìë íì(_I)"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2467
 msgid "Mark as _Junk"
 msgstr "ìíëìë íì(_J)"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2471
 msgid "Mark as _Not Junk"
 msgstr "ìíëìì ìë êìë íì(_N)"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2475
 msgid "Mar_k as Read"
 msgstr "ìì êìë íì(_K)"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2479
 msgid "Mark as Uni_mportant"
 msgstr "ììíì ìì êìë íì(_M)"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2483
 msgid "Mark as _Unread"
 msgstr "ìì ìì êìë íì(_U)"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2527
 msgid "_Caret Mode"
 msgstr "ìë ëë(_C)"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2529
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "íìíë ëììì ëë ìì êëìë ììë íìíëë"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2535
 msgid "All Message _Headers"
 msgstr "ëë ëìì íë(_H)"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2537
 msgid "Show messages with all email headers"
 msgstr "ëìì ëë íëì íê ëììë íìíëë"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../mail/e-mail-reader.c:2712
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "'%s' ëììë êììë ì"
+#: ../mail/e-mail-reader.c:2868
+msgid "Retrieving message"
+msgstr "ëìì êììê"
 
-#: ../mail/e-mail-reader.c:3632
-#: ../modules/mail/e-mail-attachment-handler.c:174
+#: ../mail/e-mail-reader.c:3851
+#: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "ìë(_F)"
 
-#: ../mail/e-mail-reader.c:3633
+#: ../mail/e-mail-reader.c:3852
 msgid "Forward the selected message to someone"
 msgstr "ìíí ëììë ëë ìëìê ìëíëë"
 
-#: ../mail/e-mail-reader.c:3652
+#: ../mail/e-mail-reader.c:3871
 msgid "Group Reply"
 msgstr "êë íì"
 
 # tooltip
-#: ../mail/e-mail-reader.c:3653
+#: ../mail/e-mail-reader.c:3872
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ëìë ëìíë íìíêë, ìëë ëë ììììê íìíëë"
 
-#: ../mail/e-mail-reader.c:3710 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3929 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "ìì"
 
-#: ../mail/e-mail-reader.c:3743
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../widgets/misc/e-calendar.c:202
+#: ../mail/e-mail-reader.c:3962
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Next"
 msgstr "ëì"
 
-#: ../mail/e-mail-reader.c:3747
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
-#: ../widgets/misc/e-calendar.c:178
+#: ../mail/e-mail-reader.c:3966
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Previous"
 msgstr "ìì"
 
-#: ../mail/e-mail-reader.c:3756 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3975 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "íì"
 
-#: ../mail/e-mail-reader.c:4457
+#: ../mail/e-mail-reader.c:4705
 #, c-format
 msgid "Folder '%s'"
 msgstr "íë '%s'"
 
 # ìì: check buttonì ìì. ëììë ëìíì ë ê
-#: ../mail/e-mail-reader-utils.c:146
+#: ../mail/e-mail-reader-utils.c:154
 msgid "Do not warn me again"
 msgstr "ëì êêíì ìê"
 
+# ìì: ëë ëììì ìëë ììë. ëì ëë "-ì"ê êì ëìíì ë ê.
+#: ../mail/e-mail-reader-utils.c:954
+msgid "Printing"
+msgstr "ìì"
+
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:641
+#: ../mail/e-mail-reader-utils.c:1136
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12048,7 +11889,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "'%s' íëì ìë ëììê %uê ììëë. ìëë ììíìêìëê?"
 
-#: ../mail/e-mail-reader-utils.c:1020
+#: ../mail/e-mail-reader-utils.c:1541
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ëìì ìì"
@@ -12058,11 +11899,21 @@ msgstr[0] "ëìì ìì"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1041
+#: ../mail/e-mail-reader-utils.c:1562
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ëìì"
 
+# ìì: ëë ëììì ìëë ììë. ëì ëë "-ì"ê êì ëìíì ë ê.
+#: ../mail/e-mail-reader-utils.c:2017
+msgid "Parsing message"
+msgstr "ëìì íì"
+
+#: ../mail/e-mail-request.c:152
+#, c-format
+msgid "Failed to load part '%s'"
+msgstr "'%s' ëëì ììëìëë ìííìëë"
+
 #: ../mail/e-mail-tag-editor.c:293
 msgid "Flag to Follow Up"
 msgstr "ìê ìì ëìì íëê"
@@ -12071,7 +11922,7 @@ msgstr "ìê ìì ëìì íëê"
 #. * 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:1229
+#: ../mail/em-composer-utils.c:1282
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12080,25 +11931,30 @@ msgstr ""
 "${TimeZone}, ${Sender}:"
 
 # ëìì ìííì ìë.
-#: ../mail/em-composer-utils.c:1240
+#: ../mail/em-composer-utils.c:1288
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Forwarded Message --------"
+
+# ëìì ìííì ìë.
+#: ../mail/em-composer-utils.c:1293
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-composer-utils.c:2467
+#: ../mail/em-composer-utils.c:2573
 msgid "an unknown sender"
 msgstr "ì ì ìë ëë ìë"
 
 # post -> êì, Microsoft Office XP ìê
-#: ../mail/em-composer-utils.c:2862
+#: ../mail/em-composer-utils.c:2991
 msgid "Posting destination"
 msgstr "êìë ììì"
 
 # post -> êì, Microsoft Office XP ìê
-#: ../mail/em-composer-utils.c:2863
+#: ../mail/em-composer-utils.c:2992
 msgid "Choose folders to post the message to."
 msgstr "ëììë ìë íëë ìííììì."
 
-#: ../mail/em-filter-editor-folder-element.c:156
+#: ../mail/em-filter-editor-folder-element.c:158
 msgid "Select Folder"
 msgstr "íë ìí"
 
@@ -12238,7 +12094,7 @@ msgstr "ìì ìë"
 msgid "is set"
 msgstr "ìì"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:114
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:109
 msgid "Junk"
 msgstr "ìíëì"
 
@@ -12287,7 +12143,7 @@ msgid "Play Sound"
 msgstr "ììë ìì"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:19
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "ìì"
 
@@ -12344,7 +12200,7 @@ msgstr "ìí ìì"
 
 #: ../mail/em-filter-i18n.h:69
 msgid "Size (kB)"
-msgstr "íê (kB)"
+msgstr "íê(kB)"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:70
@@ -12368,20 +12224,20 @@ msgstr "ììí"
 msgid "Stop Processing"
 msgstr "ìë ìì"
 
-#: ../mail/em-filter-i18n.h:77
+#: ../mail/em-filter-i18n.h:78
 msgid "Unset Color"
 msgstr "ì ìì ììê"
 
-#: ../mail/em-filter-i18n.h:78
+#: ../mail/em-filter-i18n.h:79
 msgid "Unset Status"
 msgstr "ìí ìì ììê"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:527
+#: ../mail/em-filter-rule.c:583
 msgid "Then"
 msgstr "êëë"
 
-#: ../mail/em-filter-rule.c:558
+#: ../mail/em-filter-rule.c:648
 msgid "Add Ac_tion"
 msgstr "ëì ìê(_T)"
 
@@ -12421,1691 +12277,831 @@ msgstr "ëëê(_R)"
 msgid "Folder _name:"
 msgstr "íë ìë(_N):"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:644
 msgid "Folder names cannot contain '/'"
 msgstr "íë ìëì '/'ê ëìê ì ììëë"
 
-#: ../mail/em-folder-tree.c:783
+#: ../mail/em-folder-tree.c:780
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1606
+#: ../mail/em-folder-tree.c:1605
 msgid "Mail Folder Tree"
 msgstr "ëì íë íë"
 
-#: ../mail/em-folder-tree.c:2097 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s íëë ìêë ì"
 
-#: ../mail/em-folder-tree.c:2100 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s íëë ëìíë ì"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2304
+#: ../mail/em-folder-tree.c:2142 ../mail/message-list.c:2301
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ëììë %s íëë ìêë ììëë"
 
-#: ../mail/em-folder-tree.c:2111 ../mail/message-list.c:2306
+#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2303
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ëììë %s íëë ëìíë ììëë"
 
-#: ../mail/em-folder-tree.c:2130
+#: ../mail/em-folder-tree.c:2165
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ëììë ë ìì ììêì ëì ì ììëë"
 
 # VFolderìì ëë ê ìëêë ìì êì ëìë fallback
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
 msgid "UNMATCHED"
 msgstr "íë ìì"
 
-#: ../mail/em-folder-tree-model.c:789 ../mail/em-folder-tree-model.c:1077
+#: ../mail/em-folder-tree-model.c:849 ../mail/em-folder-tree-model.c:1134
 msgid "Loading..."
 msgstr "ììëìë ì..."
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:493
 msgid "Move Folder To"
 msgstr "íë ìêê"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:493
 msgid "Copy Folder To"
 msgstr "íë ëì"
 
-#: ../mail/em-folder-utils.c:601
+#: ../mail/em-folder-utils.c:590
 msgid "Create Folder"
 msgstr "íë ëëê"
 
-#: ../mail/em-folder-utils.c:602
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "íë ëë êì ììíììì:"
 
-#: ../mail/em-format-html.c:178
-msgid "Formatting message"
-msgstr "ëìì ëìì íìíë ììëë"
+#: ../mail/em-subscription-editor.c:869
+msgid "_Subscribe"
+msgstr "êë(_S)"
 
-#: ../mail/em-format-html.c:393
-msgid "Formatting Message..."
-msgstr "ëìì ëìì íìíë ììëë..."
+#: ../mail/em-subscription-editor.c:878
+msgid "Su_bscribe To Shown"
+msgstr "íìë íëì êë(_B)"
 
-#: ../mail/em-format-html.c:1637 ../mail/em-format-html.c:1651
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "'%s' êììë ììëë"
+#: ../mail/em-subscription-editor.c:886
+msgid "Subscribe To _All"
+msgstr "ëë íëì êë(_A)"
 
-#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:97
-msgid "Unsigned"
-msgstr "ìë ìì"
+#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
+msgid "_Unsubscribe"
+msgstr "êë ìì(_U)"
 
-#: ../mail/em-format-html.c:1803 ../mail/em-format-html-display.c:98
-msgid "Valid signature"
-msgstr "ìëë ìë"
+#: ../mail/em-subscription-editor.c:995
+msgid "Unsu_bscribe From Hidden"
+msgstr "ìêì íëìì íí(_B)"
 
-#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:99
-msgid "Invalid signature"
-msgstr "ìëë ìë"
+#: ../mail/em-subscription-editor.c:1003
+msgid "Unsubscribe From _All"
+msgstr "ëë íëìì íí(_A)"
 
-#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:100
-msgid "Valid signature, but cannot verify sender"
-msgstr "ìëë ìëììë, ëë ìëì íìí ì ììëë"
+#: ../mail/em-subscription-editor.c:1682
+msgid "Folder Subscriptions"
+msgstr "íë êë"
 
-#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:101
-msgid "Signature exists, but need public key"
-msgstr "ìëì ììë, êêíê íìíëë"
+#: ../mail/em-subscription-editor.c:1722
+msgid "_Account:"
+msgstr "êì(_A):"
 
-#: ../mail/em-format-html.c:1812 ../mail/em-format-html-display.c:108
-msgid "Unencrypted"
-msgstr "ìíí ì ë"
+#: ../mail/em-subscription-editor.c:1737
+msgid "Clear Search"
+msgstr "êì ììê"
 
-#: ../mail/em-format-html.c:1813 ../mail/em-format-html-display.c:109
-msgid "Encrypted, weak"
-msgstr "ìííë, ìí"
+#: ../mail/em-subscription-editor.c:1755
+msgid "Sho_w items that contain:"
+msgstr "ëìì ëì ìë íëë íì(_W):"
 
-#: ../mail/em-format-html.c:1814 ../mail/em-format-html-display.c:110
-msgid "Encrypted"
-msgstr "ìííë"
+# tooltip
+#: ../mail/em-subscription-editor.c:1800
+msgid "Subscribe to the selected folder"
+msgstr "ìíí íëë êëíëë"
 
-#: ../mail/em-format-html.c:1815 ../mail/em-format-html-display.c:111
-msgid "Encrypted, strong"
-msgstr "ìííë, êë"
+#: ../mail/em-subscription-editor.c:1801
+msgid "Su_bscribe"
+msgstr "êë(_B)"
 
-#: ../mail/em-format-html.c:2210
-msgid "Unknown external-body part."
-msgstr "ìë ëë ëëì ììëë."
+# tooltip
+#: ../mail/em-subscription-editor.c:1846
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
+msgid "Unsubscribe from the selected folder"
+msgstr "ìíí íëìì êëì ììíëë"
 
-#: ../mail/em-format-html.c:2220
-msgid "Malformed external-body part."
-msgstr "ìë ëë ëëì íìì ìëëììëë."
+# tooltip
+#: ../mail/em-subscription-editor.c:1886
+msgid "Collapse all folders"
+msgstr "ëë íëë ììëë"
 
-#: ../mail/em-format-html.c:2251
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP ììí(%s)ë êëíëë"
+#: ../mail/em-subscription-editor.c:1887
+msgid "C_ollapse All"
+msgstr "ëë ììê(_O)"
 
-#: ../mail/em-format-html.c:2262
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ììí \"%2$s\"ì ëì íì(%1$s)ì êëíëë"
+# tooltip
+#: ../mail/em-subscription-editor.c:1897
+msgid "Expand all folders"
+msgstr "ëë íëë íìëë"
 
-#: ../mail/em-format-html.c:2264
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "ëì íì(%s)ì êëíëë"
+#: ../mail/em-subscription-editor.c:1898
+msgid "E_xpand All"
+msgstr "ëë íìê(_X)"
 
-#: ../mail/em-format-html.c:2285
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "ìê ëìí(%s)ì êëíëë"
+# tooltip
+#: ../mail/em-subscription-editor.c:1908
+msgid "Refresh the folder list"
+msgstr "íë ëëì ìë êìëë"
 
-#: ../mail/em-format-html.c:2300
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "ì ì ìë ìë ëìí(\"%s\" íì)ì êëíëë"
+# tooltip
+#: ../mail/em-subscription-editor.c:1920
+msgid "Stop the current operation"
+msgstr "íì ëìì ììíëë"
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:3008
-#: ../plugins/mail-notification/mail-notification.c:395
+#. Translators: This message is shown only for ten or more
+#. * 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:106
 #, c-format
-msgid "From: %s"
-msgstr "ëë ìë: %s"
+msgid "Are you sure you want to open %d message at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "ìëë %dêì ëììë ëìì ììêìëê?"
 
-#: ../mail/em-format-html.c:3030
-msgid "(no subject)"
-msgstr "(ìë ìì)"
+#: ../mail/em-utils.c:162
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+msgid "_Do not show this message again"
+msgstr "ì ëìì ëì ëì ìê(_D)"
+
+#: ../mail/em-utils.c:314
+msgid "Message Filters"
+msgstr "ëìì íí"
 
-#: ../mail/em-format-html.c:3106
+#: ../mail/em-utils.c:1067
 #, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "ì ëììë %sì(ê) %s ìêìë ëëìëë."
+msgid "Messages from %s"
+msgstr "%sìì ì ëì"
 
-#: ../mail/em-format-html-display.c:97
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"ì ëìììë ìëì ììëë.  ëììë ëë ìëì íìí ì ëìí ì ìì"
-"ëë."
-
-#: ../mail/em-format-html-display.c:98
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"ì ëììë ìëëìê ìëì ìëëëë.  ëììë ëë ìëì ê ìëì ê"
-"ì íìíëë."
+#: ../mail/em-vfolder-editor.c:105
+msgid "Search _Folders"
+msgstr "íë êì(_F)"
 
-#: ../mail/em-format-html-display.c:99
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"ì ëììì ìëì íìí ì ììëë. ëìì ìììì ëêëìì ì ììë"
-"ë."
+#: ../mail/em-vfolder-editor-rule.c:391
+msgid "Add Folder"
+msgstr "íë ìê"
 
-#: ../mail/em-format-html-display.c:100
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"ì ëììë ìëë ìëìë ììëììëë. íìë ëììë ëë ìëì íì"
-"í ì ììëë."
+#: ../mail/em-vfolder-editor-rule.c:517
+msgid "Search Folder Sources"
+msgstr "íë ìì êì"
 
-#: ../mail/em-format-html-display.c:101
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
-msgstr "ì ëììë ìëëì ììë, ìëì íëíë êê íê ììëë."
+#: ../mail/em-vfolder-editor-rule.c:549
+msgid "Automatically update on any _source folder change"
+msgstr "ëë ìì íë ëêì ëí ìëìë ìëìí(_S)"
 
-#: ../mail/em-format-html-display.c:108
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
-msgstr ""
-"ì ëììë ìíííì ìììëë.  ìíëì íí ìëëë ëì ëë ìëì "
-"ì ëììë ëì ì ììëë."
+#: ../mail/em-vfolder-editor-rule.c:561
+msgid "All local folders"
+msgstr "ëë ëì íë"
 
-#: ../mail/em-format-html-display.c:109
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"ëììê ìííëì ììë, ìí ìíí ìêëììë ìííëììëë.  ëë "
-"ìëì ì ëììì ëìì ìì ëë ê ìëê íìë, íììì ìê ëì ëê"
-"ëíìë ììëë."
+#: ../mail/em-vfolder-editor-rule.c:562
+msgid "All active remote folders"
+msgstr "ëë íìíí ìê íë"
 
-#: ../mail/em-format-html-display.c:110
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
-"ëììê ìííëì ììëë.  ëë ìëì ì ëììì ëìì ìì ëêë ì"
-"ëìëë."
+#: ../mail/em-vfolder-editor-rule.c:563
+msgid "All local and active remote folders"
+msgstr "ëë ëì íëì íìíí ìê íë"
 
-#: ../mail/em-format-html-display.c:111
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"ëììê ìííëì ììë, ìí ìíí ìêëììë ìííëììëë.  íì"
-"ìì ìê ëì ëë ìëì ì ëììì ëìì ìì ëë ê ëì ìëìëë."
+#: ../mail/em-vfolder-editor-rule.c:564
+msgid "Specific folders"
+msgstr "ììí íë"
 
-#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.ui.h:43
-msgid "_View Certificate"
-msgstr "ììì ëê(_V)"
+#: ../mail/em-vfolder-editor-rule.c:602
+msgid "include subfolders"
+msgstr "íì íë íí"
 
-#: ../mail/em-format-html-display.c:274
-msgid "This certificate is not viewable"
-msgstr "ì ìììë ë ì ììëë"
+#: ../mail/importers/elm-importer.c:179
+msgid "Importing Elm data"
+msgstr "ELM ëìí êììê"
 
-#: ../mail/em-format-html-display.c:589
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"ììëì íêê ìëíêì ëë ìì ìëëììì íìíì ëíìëë. ìë "
-"êëë ëêë ìë íìí íìêë ë ì ììëë."
+#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
+#: ../modules/mail/e-mail-shell-view.c:1074
+#: ../widgets/misc/e-send-options.c:538
+msgid "Mail"
+msgstr "ëì"
 
-#: ../mail/em-format-html-display.c:773
-msgid "Save Image"
-msgstr "êë ìì"
+#: ../mail/importers/elm-importer.c:379
+msgid "Evolution Elm importer"
+msgstr "ìëëì ELM êììê"
 
-#: ../mail/em-format-html-display.c:821
-msgid "Save _Image..."
-msgstr "êë ìì(_I)..."
+#: ../mail/importers/elm-importer.c:380
+msgid "Import mail from Elm."
+msgstr "ELMìì ëìì êììëë."
 
-#: ../mail/em-format-html-display.c:823
-msgid "Save the image to a file"
-msgstr "êëì íìì ììíëë"
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:255
+msgid "_Destination folder:"
+msgstr "ëì íë(_D):"
 
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-format-html-display.c:1024
-msgid "Completed on"
-msgstr "ìë ëì"
+#: ../mail/importers/evolution-mbox-importer.c:148
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:570
+msgid "Select folder"
+msgstr "íë ìí"
 
-#: ../mail/em-format-html-display.c:1036
-msgid "Overdue:"
-msgstr "ëê ìë:"
+#: ../mail/importers/evolution-mbox-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:262
+#: ../plugins/pst-import/pst-importer.c:571
+msgid "Select folder to import into"
+msgstr "ìë íëë êìì ì ìííììì"
 
-#: ../mail/em-format-html-display.c:1044
-msgid "by"
-msgstr "ëì:"
+#: ../mail/importers/evolution-mbox-importer.c:439
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "ìë"
 
-#: ../mail/em-format-html-display.c:1325 ../mail/em-format-html-display.c:1376
-msgid "View _Unformatted"
-msgstr "ìë ëê(_U)"
+#: ../mail/importers/evolution-mbox-importer.c:444
+msgctxt "mboxImp"
+msgid "From"
+msgstr "ëë ìë"
 
-#: ../mail/em-format-html-display.c:1327
-msgid "Hide _Unformatted"
-msgstr "ìë ìêê(_U)"
+#: ../mail/importers/evolution-mbox-importer.c:488
+#: ../shell/e-shell-utils.c:195
+msgid "Berkeley Mailbox (mbox)"
+msgstr "ëíë ëìëì(mbox)"
 
-#: ../mail/em-format-html-display.c:1398
-msgid "O_pen With"
-msgstr "ëë íëêëìë ìê(_P)"
+#: ../mail/importers/evolution-mbox-importer.c:489
+msgid "Importer Berkeley Mailbox format folders"
+msgstr "ëíë ëìëì íì íë êììê"
 
-#. Translators: Name of an Attachment button for a11y object
-#: ../mail/em-format-html-display.c:1407
-msgctxt "Button"
-msgid "Attachment"
-msgstr "ìë"
+#: ../mail/importers/mail-importer.c:63
+msgid "Importing mailbox"
+msgstr "ëìí êììê"
 
-#: ../mail/em-format-html-print.c:157
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:616
+#: ../plugins/pst-import/pst-importer.c:784
 #, c-format
-msgid "Page %d of %d"
-msgstr "%2$díìì ì %1$díìì"
+msgid "Importing '%s'"
+msgstr "'%s' êììë ììëë"
 
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
+#: ../mail/importers/mail-importer.c:316
 #, c-format
-msgid "No HTML stream available"
-msgstr "HTML ìíëì ììëë"
-
-#: ../mail/em-subscription-editor.c:870
-msgid "_Subscribe"
-msgstr "êë(_S)"
+msgid "Scanning %s"
+msgstr "%s êìíë ììëë"
 
-#: ../mail/em-subscription-editor.c:879
-msgid "Su_bscribe To Shown"
-msgstr "íìë íëì êë(_B)"
+#: ../mail/importers/pine-importer.c:251
+msgid "Importing Pine data"
+msgstr "PINE ëìí êììê"
 
-#: ../mail/em-subscription-editor.c:887
-msgid "Subscribe To _All"
-msgstr "ëë íëì êë(_A)"
+#: ../mail/importers/pine-importer.c:430
+msgid "Address Book"
+msgstr "ììë"
 
-#: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
-msgid "_Unsubscribe"
-msgstr "êë ìì(_U)"
+#: ../mail/importers/pine-importer.c:478
+msgid "Evolution Pine importer"
+msgstr "ìëëì PINE êììê"
 
-#: ../mail/em-subscription-editor.c:996
-msgid "Unsu_bscribe From Hidden"
-msgstr "ìêì íëìì íí(_B)"
+#: ../mail/importers/pine-importer.c:479
+msgid "Import mail from Pine."
+msgstr "PINEìì ëìì êììëë."
 
-#: ../mail/em-subscription-editor.c:1004
-msgid "Unsubscribe From _All"
-msgstr "ëë íëìì íí(_A)"
+#: ../mail/mail-autofilter.c:73
+#, c-format
+msgid "Mail to %s"
+msgstr "%sì ëëë ëì"
 
-#: ../mail/em-subscription-editor.c:1675
-msgid "Folder Subscriptions"
-msgstr "íë êë"
+#: ../mail/mail-autofilter.c:229 ../mail/mail-autofilter.c:272
+#, c-format
+msgid "Mail from %s"
+msgstr "%sìì ì ëì"
 
-#: ../mail/em-subscription-editor.c:1715
-msgid "_Account:"
-msgstr "êì(_A):"
+#: ../mail/mail-autofilter.c:255
+#, c-format
+msgid "Subject is %s"
+msgstr "ìëì %s"
 
-#: ../mail/em-subscription-editor.c:1730
-msgid "Clear Search"
-msgstr "êì ììê"
+#: ../mail/mail-autofilter.c:296
+#, c-format
+msgid "%s mailing list"
+msgstr "%s ëìë ëìí"
 
-#: ../mail/em-subscription-editor.c:1748
-msgid "Sho_w items that contain:"
-msgstr "ëìì ëì ìë íëë íì(_W):"
+#: ../mail/mail-autofilter.c:406
+msgid "Add Filter Rule"
+msgstr "íí êì ìê"
 
-# tooltip
-#: ../mail/em-subscription-editor.c:1793
-msgid "Subscribe to the selected folder"
-msgstr "ìíí íëë êëíëë"
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * 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:513
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"ëì íí êì:\n"
+"%s êìì ìëìííìëë. ì êìì ë ìêí ëì íëë ììíìëë:\n"
+"\"%s\""
 
-#: ../mail/em-subscription-editor.c:1794
-msgid "Su_bscribe"
-msgstr "êë(_B)"
+#: ../mail/mail-config.ui.h:1
+msgid "Set custom junk header"
+msgstr "ììì ìì ìí ëì íë ìì"
 
-# tooltip
-#: ../mail/em-subscription-editor.c:1839
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
-msgid "Unsubscribe from the selected folder"
-msgstr "ìíí íëìì êëì ììíëë"
+#: ../mail/mail-config.ui.h:2
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+"íë íë ëìì ìíëìë ííëíê ëë íëê ìë ëë ì ììëì"
 
-# tooltip
-#: ../mail/em-subscription-editor.c:1879
-msgid "Collapse all folders"
-msgstr "ëë íëë ììëë"
+#: ../mail/mail-config.ui.h:3
+msgid "Header name"
+msgstr "íë ìë"
 
-#: ../mail/em-subscription-editor.c:1880
-msgid "C_ollapse All"
-msgstr "ëë ììê(_O)"
+#: ../mail/mail-config.ui.h:4
+msgid "Header content"
+msgstr "íë ëì"
 
-# tooltip
-#: ../mail/em-subscription-editor.c:1890
-msgid "Expand all folders"
-msgstr "ëë íëë íìëë"
+#: ../mail/mail-config.ui.h:5
+msgid "Default Behavior"
+msgstr "êë ëì"
 
-#: ../mail/em-subscription-editor.c:1891
-msgid "E_xpand All"
-msgstr "ëë íìê(_X)"
+#: ../mail/mail-config.ui.h:6
+msgid "For_mat messages in HTML"
+msgstr "ëììë HTML íììë(_M)"
 
-# tooltip
-#: ../mail/em-subscription-editor.c:1901
-msgid "Refresh the folder list"
-msgstr "íë ëëì ìë êìëë"
+#: ../mail/mail-config.ui.h:7
+msgid "Automatically insert _emoticon images"
+msgstr "ìëìë ìëíì êë ëê(_E)"
 
-# tooltip
-#: ../mail/em-subscription-editor.c:1913
-msgid "Stop the current operation"
-msgstr "íì ëìì ììíëë"
+# read receipt -> ëì ìì íì, Microsoft Office XP ìê
+#: ../mail/mail-config.ui.h:8
+msgid "Always request rea_d receipt"
+msgstr "íì ëì ìì íì ìì(_D)"
 
-#. Translators: This message is shown only for ten or more
-#. * 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:110
-#, c-format
-msgid "Are you sure you want to open %d message at once?"
-msgid_plural "Are you sure you want to open %d messages at once?"
-msgstr[0] "ìëë %dêì ëììë ëìì ììêìëê?"
+#: ../mail/mail-config.ui.h:9
+msgid "Encode filenames in an _Outlook/GMail way"
+msgstr "íì ìëì ììë/ìëì ëììë ììë(_O)"
 
-#: ../mail/em-utils.c:166
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
-msgid "_Do not show this message again"
-msgstr "ì ëìì ëì ëì ìê(_D)"
+#: ../mail/mail-config.ui.h:10
+msgid "Ch_aracter encoding:"
+msgstr "ëì ììë(_A):"
 
-#: ../mail/em-utils.c:318
-msgid "Message Filters"
-msgstr "ëìì íí"
-
-#: ../mail/em-utils.c:979
-#, c-format
-msgid "Messages from %s"
-msgstr "%sìì ì ëì"
+#: ../mail/mail-config.ui.h:11
+msgid "Replies and Forwards"
+msgstr "íì ë ìë"
 
-#: ../mail/em-vfolder-editor.c:105
-msgid "Search _Folders"
-msgstr "íë êì(_F)"
+#: ../mail/mail-config.ui.h:12
+msgid "_Reply style:"
+msgstr "íì ëì(_R):"
 
-#: ../mail/em-vfolder-editor-rule.c:339
-msgid "Add Folder"
-msgstr "íë ìê"
+#: ../mail/mail-config.ui.h:13
+msgid "_Forward style:"
+msgstr "ìë ëì(_F):"
 
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
-msgstr "ìëì ìëëì ììë ëìí ìëíê (PGP ëë S/MIME)"
+#: ../mail/mail-config.ui.h:14
+msgid "Start _typing at the bottom on replying"
+msgstr "íìí ë ë ìëëí ìë ìì(_T)"
 
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Composer Window default width"
-msgstr "ëìì ìì ì êë ëë"
+#: ../mail/mail-config.ui.h:15
+msgid "_Keep signature above the original message on replying"
+msgstr "íìí ë ìë ìì ìë ëê(_K)"
 
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default width of the Composer Window."
-msgstr "ëìì ìì ìì êë ëë."
+#: ../mail/mail-config.ui.h:16
+msgid "Ig_nore Reply-To: for mailing lists"
+msgstr "ëìë ëìíìì Reply-To: ëì(_N)"
 
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Composer Window default height"
-msgstr "ëìì ìì ì êë ëì"
+#: ../mail/mail-config.ui.h:17
+msgid "Gro_up Reply goes only to mailing list, if possible"
+msgstr "êë íìì(êëí êì) ëìë ëìíìë íì(_U)"
 
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "Default height of the Composer Window."
-msgstr "ëìì ìì ìì êë ëì."
+#: ../mail/mail-config.ui.h:18
+msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+msgstr "ìëì ìëëì ììë ëìí ìëíê(PGP ëë S/MIME)(_S)"
 
-#: ../mail/evolution-mail.schemas.in.h:45
-msgid "Attribute message."
-msgstr "ììí ëìì."
+#: ../mail/mail-config.ui.h:20
+msgid "Sig_natures"
+msgstr "ìë(_N)"
 
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
-msgstr "ëììì ëìí ë, ëììì ìììë íìíë íìí."
+#: ../mail/mail-config.ui.h:21
+msgid "Signatures"
+msgstr "ìë"
 
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid "Forward message."
-msgstr "ëìì ìë."
+#: ../mail/mail-config.ui.h:22
+msgid "_Languages"
+msgstr "ìì(_L)"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/mail-config.ui.h:23
 msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
-msgstr ""
-"ëììë ìëí ë, ëì ëìì ìëí ëììëë ììì ìëíë íìí."
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "ì ìì ëëì ììì ììí ììë ëì ììëë."
 
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid "Original message."
-msgstr "ìë ëìì."
+#: ../mail/mail-config.ui.h:24
+msgid "Languages Table"
+msgstr "ìì í"
 
-#: ../mail/evolution-mail.schemas.in.h:50
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
-msgstr ""
-"ëììì íìí ë (ìì ëì ëìì ì êì), ëì ëìì ìë ëììëë ì"
-"ìì ìëíë íìí."
+#: ../mail/mail-config.ui.h:26
+msgid "Check spelling while I _type"
+msgstr "ìëí ë ëìë êì(_T)"
 
-# íì êíììë, íêìë ìíí êì "~/ìì" íëë ììíë.
-#: ../mail/evolution-mail.schemas.in.h:52
-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/mail-config.ui.h:27
+msgid "Color for _misspelled words:"
+msgstr "ëìëì íë êìì ì(_M):"
 
-#: ../mail/evolution-mail.schemas.in.h:97
-msgid "Whether to show local folders (On This Computer) in a folder tree."
-msgstr "íë êììì ëì íëë (\"ì ìíí\" íë) íìíì ìë."
+#: ../mail/mail-config.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Pick a color"
+msgstr "ìì êëììì"
 
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
-msgstr ""
-"ì ììì êíëë êëêìë íì ìíë íì ìí ìíë íì ììíëë. "
-"ììíëë ëì ììíì íëë."
+#: ../mail/mail-config.ui.h:29
+msgid "Spell Checking"
+msgstr "ëìë êì"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/mail-config.ui.h:30
 msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 msgstr ""
-"ëìì íëë êëêìì ììíì íìíì êìíëë. \"0\" = íì, \"1\" = "
-"ìì"
-
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
-msgstr "ëì ëêìì êìì ìëíëë ììí ëëì ëíëëë. ììë êìì ìì ììëë ìëíëë. ë, \"ì ìíí\"ì \"êì\" íëë ìììëë. êììë êìì ìììê ììí ììëë ìëíëë."
+"ëìì ììë ëëêë êëí ëìì ëëì ìëë, ëì ëìì ëí íì ì"
+"ëì íëë:"
 
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Mail browser width"
-msgstr "ëì ëê ëë"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:32
+msgid "Sending a message with an _empty subject line"
+msgstr "ìëì ìì ëììë ëëê(_E)"
 
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Default width of the mail browser window."
-msgstr "ëì ëê ìì êë ëë."
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:34
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "ìì ììëë ëììë ëëê(_B)"
 
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Mail browser height"
-msgstr "ëì ëê ëì"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:36
+msgid "Sending a _private reply to a mailing list message"
+msgstr "ëìë ëìí ëììì êì íì ëëê(_P)"
 
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Default height of the mail browser window."
-msgstr "ëì ëê ìì êë ëì."
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:38
+msgid "Sending a reply to a large _number of recipients"
+msgstr "ìë ëì ììììê íìì ëëê(_N)"
 
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Mail browser maximized"
-msgstr "ëì ëê ìëí"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:40
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "ëìë ëìíìì êì íìì ëìíë ëëê íì(_M)"
 
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Default maximized state of the mail browser window."
-msgstr "ëì ëê ìì êë ìëí ìí."
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:42
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr "ëì ììë ìëíì ìì ììììê ëìì ëëê(_R){0}"
 
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "\"Folder Subscriptions\" window height"
-msgstr "\"íë êë\" ì ëì"
+#: ../mail/mail-config.ui.h:43
+msgid "Confirmations"
+msgstr "íì"
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"\"íë êë\" ìì ìì ëì. ìììê ìë ëíìë ì íêë ëêë ì ê"
-"ì ëëëë."
+# FIXME: wrong msgid - list model
+#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "\"íë êë\" ì ìëí ìí"
+# FIXME: wrong msgid - list model
+#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid ""
-"Initial maximize state of the \"Folder Subscriptions\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Folder Subscriptions\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"\"íë êë\" ìì ìì ìëí ìí. ìììê ì ìì ìëííêë ììí ë"
-"ëë ì êì ëëëë. \"íë êë\" ìì ìëíí ì ìê ëëì ì êì ì"
-"ìëë ììíì ììëë. ì íë ëë ìëëë ììíëë."
+#: ../mail/mail-config.ui.h:51
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "ìë"
 
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "\"Folder Subscriptions\" window width"
-msgstr "\"íë êë\" ì ëë"
+#: ../mail/mail-config.ui.h:52
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "íí(Outlook ëì)"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid ""
-"Initial width of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"\"íë êë\" ìì ìì ëë. ìììê êë ëíìë ì íêë ëêë ì ê"
-"ì ëëëë."
+#: ../mail/mail-config.ui.h:53
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "ìì"
 
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Default reply style"
-msgstr "êë íì ëìì"
+#: ../mail/mail-config.ui.h:54
+msgctxt "ReplyForward"
+msgid "Do not quote"
+msgstr "ììíì ìê"
 
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
-msgstr ""
-"ìì êëí êì: never - ëëìì ìì ëì ìì, always - íì ëëìì ì"
-"ì ëì, ask - (ìëë êí ê) ììììê íì ìë"
+#: ../mail/mail-config.ui.h:55
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "íí"
 
-#: ../mail/evolution-mail.schemas.in.h:207
-msgid "List of accounts"
-msgstr "êì ëë"
+#: ../mail/mail-config.ui.h:56
+msgid "Proxy Settings"
+msgstr "íëì ìì"
 
-#: ../mail/evolution-mail.schemas.in.h:208
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"ìëëìì ëì ìíëíì ììí êì ëëìëë. ì ëëìë /apps/"
-"evolution/mail/accountsì ìëìì ìëëëíëì ìëì ëì ììëë."
+#: ../mail/mail-config.ui.h:57
+msgid "_Use system defaults"
+msgstr "ììí êëê ìì(_U)"
 
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "List of accepted licenses"
-msgstr "ììí ìêì ëë"
+#: ../mail/mail-config.ui.h:58
+msgid "_Direct connection to the Internet"
+msgstr "ìíëì ìì ìê(_D)"
 
-#: ../mail/evolution-mail.schemas.in.h:210
-msgid "List of protocol names whose license has been accepted."
-msgstr "ìêì ëìí íëíì ìëì ëë."
+#: ../mail/mail-config.ui.h:59
+msgid "_Manual proxy configuration:"
+msgstr "ìë íëì ìì(_M):"
 
-#: ../mail/evolution-mail.schemas.in.h:213
-msgid "\"Filter Editor\" window height"
-msgstr "\"íí íì\" ì ëì"
+#: ../mail/mail-config.ui.h:60
+msgid "H_TTP Proxy:"
+msgstr "HTTP íëì(_T):"
 
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
-"\"íí íì\" ìì ìì ëì. ìììê ìë ëíìë ì íêë ëêë ì ê"
-"ì ëëëë."
+#: ../mail/mail-config.ui.h:61
+msgid "_Secure HTTP Proxy:"
+msgstr "ëì HTTP íëì(_S):"
 
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid "\"Filter Editor\" window maximize state"
-msgstr "\"íí íì\" ì ìëí ìí"
+#: ../mail/mail-config.ui.h:62
+msgid "SOC_KS Proxy:"
+msgstr "SOCKS íëì(_K):"
 
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
-"\"íí íì\" ìì ìì ìëí ìí. ìììê ì ìì ìëííêë ììí ë"
-"ëë ì êì ëëëë. \"íí íì\" ìì ìëíí ì ìê ëëì ì êì ì"
-"ìëë ììíì ììëë. ì íë ëë ìëëë ììíëë."
+#: ../mail/mail-config.ui.h:63
+msgid "No _Proxy for:"
+msgstr "íëì ìë íìí(_P):"
 
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "\"Filter Editor\" window width"
-msgstr "\"íí íì\" ì ëë"
+#: ../mail/mail-config.ui.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+msgid "Port:"
+msgstr "íí:"
 
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-"\"íí íì\" ìì ìì ëë. ìììê êë ëíìë ì íêë ëêë ì ê"
-"ì ëëëë."
+#: ../mail/mail-config.ui.h:65
+msgid "Use Authe_ntication"
+msgstr "ìì ìì(_N)"
 
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr ""
-"ìëëìì ììí ë ì ëììë íìíì ìë. ì ë ëë íìíì ëììë "
-"ëëëë."
+#: ../mail/mail-config.ui.h:66
+msgid "Us_ername:"
+msgstr "ììììë(_E):"
 
-# "Check for new messages every X messages" -> "ì ëì íì(_N), ë"
-#: ../mail/evolution-mail.schemas.in.h:222
-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 ""
-"ìëëìì ììí ë êìì \"ì ëì íì, ë Xë\" ììê êêìì ëë ì"
-"ì ìì êìì ì ëììë íìíì ìë. ì ììì \"send_recv_on_start\" ì"
-"ìê êìë ììíëë."
+#: ../mail/mail-config.ui.h:67
+msgid "Pass_word:"
+msgstr "ìí(_W):"
 
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "\"Send and Receive Mail\" window height"
-msgstr "\"ëì ëëê ëê\" ì ëì"
+#: ../mail/mail-config.ui.h:68
+msgid "Start up"
+msgstr "ìì"
 
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"\"ëì ëëê ëê\" ìì ìì ëì. ìììê ìë ëíìë ì íêë ëêë "
-"ì êì ëëëë."
+#: ../mail/mail-config.ui.h:69
+msgid "Check for new _messages on start"
+msgstr "ììí ë ì ëìì íì(_M)"
 
-#: ../mail/evolution-mail.schemas.in.h:225
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "\"ëì ëëê ëê\" ìëí ìí"
+# FIXME - hard to translate UI + string based on English grammar
+#: ../mail/mail-config.ui.h:70
+msgid "Check for new messa_ges in all active accounts"
+msgstr "ìì ìì ëë êììì ì ëìì íì(_G)"
 
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"\"ëì ëëê ëê\" ìì ìì ìëí ìí. ìììê ì ìì ìëííêë ì"
-"ìí ëëë ì êì ëëëë. \"ëì ëëê ëê\" ìì ìëíí ì ìê ëë"
-"ì ì êì ììëë ììíì ììëë. ì íë ëë ìëëë ììíëë."
+#: ../mail/mail-config.ui.h:71
+msgid "Message Display"
+msgstr "ëìì íì"
 
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "\"Send and Receive Mail\" window width"
-msgstr "\"ëì ëëê ëê\" ì ëë"
+#: ../mail/mail-config.ui.h:72
+msgid "_Use the same fonts as other applications"
+msgstr "ëë íëêëê êì êê ìì(_U)"
 
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"\"ëì ëëê ëê\" ìì ìì ëë. ìììê êë ëíìë ì íêë ëêë "
-"ì êì ëëëë."
+#: ../mail/mail-config.ui.h:73
+msgid "S_tandard Font:"
+msgstr "ìë êê(_T):"
 
-#: ../mail/evolution-mail.schemas.in.h:229
-msgid "\"Search Folder Editor\" window height"
-msgstr "\"êì íë íì\" ì ëì"
+#: ../mail/mail-config.ui.h:74
+msgid "Select HTML fixed width font"
+msgstr "HTML êìí êêì ìííììì"
 
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"\"êì íë íì\" ìì ìì ëì. ìììê ìë ëíìë ì íêë ëêë "
-"ì êì ëëëë."
+#: ../mail/mail-config.ui.h:75
+msgid "Select HTML variable width font"
+msgstr "HTML êëí êêì ìííììì"
 
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "\"êì íë íì\" ì ìëí ìí"
+#: ../mail/mail-config.ui.h:76
+msgid "Fix_ed Width Font:"
+msgstr "êìí êê(_E):"
 
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"\"êì íë íì\" ìì ìì ìëí ìí. ìììê ì ìì ìëííêë ìì"
-"í ëëë ì êì ëëëë. \"êì íë íì\" ìì ìëíí ì ìê ëëì "
-"ì êì ììëë ììíì ììëë. ì íë ëë ìëëë ììíëë."
+#: ../mail/mail-config.ui.h:77
+msgid "_Mark messages as read after"
+msgstr "ëì ìêì ìë ë ëììë ìì êìë íì(_M)"
 
-#: ../mail/evolution-mail.schemas.in.h:233
-msgid "\"Search Folder Editor\" window width"
-msgstr "\"êì íë íì\" ì ëë"
+#: ../mail/mail-config.ui.h:79
+msgid "Highlight _quotations with"
+msgstr "ììëì ëì ìêë íì(_Q):"
 
-#: ../mail/evolution-mail.schemas.in.h:234
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"\"êì íë íì\" ìì ìì ëë. ìììê êë ëíìë ì íêë ëêë "
-"ì êì ëëëë."
+#: ../mail/mail-config.ui.h:80
+msgid "color"
+msgstr "ìì"
 
-#: ../mail/evolution-mail.schemas.in.h:235
-msgid "Drag'n'drop export format"
-msgstr "ëìëê ëëëê íì"
+#: ../mail/mail-config.ui.h:81
+msgid "Default character e_ncoding:"
+msgstr "êë ëì ììë(_N):"
 
-#: ../mail/evolution-mail.schemas.in.h:236
-msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are "
-"mbox or pdf"
-msgstr "ëìì ëìëì ë ëëëê íìì ììíëë. ìì êëí êì \"mbox\" ëë \"pdf\"ìëë."
+#: ../mail/mail-config.ui.h:82
+msgid "Apply the same _view settings to all folders"
+msgstr "ëë íëì êì ëê ìì ìì(_V)"
 
-#: ../mail/evolution-mail.schemas.in.h:237
-msgid "Format of the drag'n'drop export filename"
-msgstr "ëìëê ëëëê íì ìë íì"
+#: ../mail/mail-config.ui.h:83
+msgid "F_all back to threading messages by subject"
+msgstr "ìêë ëììê ìëëëë ìëì ëë êíëë ëëê(_A)"
 
-#: ../mail/evolution-mail.schemas.in.h:238
-msgid ""
-"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
-"email sent date), 2 (: drag'n'drop date)"
-msgstr "ëëëë íì ìëì YYYYmmDDHHMMSS_ëì_ìë íììëë. êëí êì: 1 (ëì ëë ìê), 2 (ëìëì ìê)"
+#: ../mail/mail-config.ui.h:84
+msgid "Delete Mail"
+msgstr "ëì ìì"
 
-#: ../mail/importers/elm-importer.c:181
-msgid "Importing Elm data"
-msgstr "ELM ëìí êììê"
+#: ../mail/mail-config.ui.h:85
+msgid "Empty trash folders on e_xit"
+msgstr "ëë ë íìí íë ëìê(_X): "
 
-#: ../mail/importers/elm-importer.c:353 ../mail/importers/pine-importer.c:460
-#: ../modules/mail/e-mail-shell-view.c:1042
-#: ../widgets/misc/e-send-options.c:538
-msgid "Mail"
-msgstr "ëì"
+#: ../mail/mail-config.ui.h:86
+msgid "Confirm _when expunging a folder"
+msgstr "íëë ëì ë íì ìë(_W)"
 
-#: ../mail/importers/elm-importer.c:400
-msgid "Evolution Elm importer"
-msgstr "ìëëì ELM êììê"
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.ui.h:88
+msgid "_Show animated images"
+msgstr "ìëëìì íì(_S)"
 
-#: ../mail/importers/elm-importer.c:401
-msgid "Import mail from Elm."
-msgstr "ELMìì ëìì êììëë."
+#: ../mail/mail-config.ui.h:89
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "HTML ëìì ëê ìì ìì ìëíí ëë ë íì ìë(_P)"
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:260
-msgid "_Destination folder:"
-msgstr "ëì íë(_D):"
+# ìí ìíê ìëë ìì ìì ìë, "~íë ì"ìë ëìíì ë ê
+#: ../mail/mail-config.ui.h:90
+msgid "Loading Images"
+msgstr "êë ììëìê"
 
-#: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:266
-#: ../plugins/pst-import/pst-importer.c:557
-msgid "Select folder"
-msgstr "íë ìí"
+#: ../mail/mail-config.ui.h:91
+msgid "_Never load images from the Internet"
+msgstr "êëì ìíëìì ììëìì ìê(_N)"
 
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:267
-#: ../plugins/pst-import/pst-importer.c:558
-msgid "Select folder to import into"
-msgstr "ìë íëë êìì ì ìííììì"
+#: ../mail/mail-config.ui.h:92
+msgid "_Load images only in messages from contacts"
+msgstr "ëëìê ìëìì ëì ìë ëììììë êë ììëìê(_L)"
 
-#: ../mail/importers/evolution-mbox-importer.c:438
-msgctxt "mboxImp"
-msgid "Subject"
-msgstr "ìë"
+#: ../mail/mail-config.ui.h:93
+msgid "_Always load images from the Internet"
+msgstr "íì ìíëìì êë ììëìê(_A)"
 
-#: ../mail/importers/evolution-mbox-importer.c:443
-msgctxt "mboxImp"
-msgid "From"
-msgstr "ëë ìë"
+#: ../mail/mail-config.ui.h:94
+msgid "HTML Messages"
+msgstr "HTML ëìì"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
-#: ../shell/e-shell-utils.c:195
-msgid "Berkeley Mailbox (mbox)"
-msgstr "ëíë ëìëì (mbox)"
+#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "ëìë"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
-msgid "Importer Berkeley Mailbox format folders"
-msgstr "ëíë ëìëì íì íë êììê"
+#: ../mail/mail-config.ui.h:96
+msgid "Sender Photograph"
+msgstr "ëëë ìë ìì"
 
-#: ../mail/importers/mail-importer.c:63
-msgid "Importing mailbox"
-msgstr "ëìí êììê"
+#: ../mail/mail-config.ui.h:97
+msgid "_Show the photograph of sender in the message preview"
+msgstr "ëì ëë ëêìì ëë ìëì ìì ëìê(_S)"
 
-#. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:621
-#: ../plugins/pst-import/pst-importer.c:770
-#, c-format
-msgid "Importing '%s'"
-msgstr "'%s' êììë ììëë"
+#: ../mail/mail-config.ui.h:98
+msgid "S_earch for sender photograph only in local address books"
+msgstr "ëì ììëììë ëë ìëì ìì êì(_E)"
 
-#: ../mail/importers/mail-importer.c:316
-#, c-format
-msgid "Scanning %s"
-msgstr "%s êìíë ììëë"
+#: ../mail/mail-config.ui.h:99
+msgid "Displayed Message Headers"
+msgstr "íìíë ëìì íë"
 
-#: ../mail/importers/pine-importer.c:262
-msgid "Importing Pine data"
-msgstr "PINE ëìí êììê"
+#: ../mail/mail-config.ui.h:100
+msgid "Mail Headers Table"
+msgstr "ëì íë í"
 
-#: ../mail/importers/pine-importer.c:467
-#: ../modules/addressbook/addressbook-config.c:1115
-msgid "Address Book"
-msgstr "ììë"
+#: ../mail/mail-config.ui.h:101
+#: ../modules/addressbook/autocompletion-config.c:90
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Date/Time Format"
+msgstr "ëì/ìê íì"
 
-#: ../mail/importers/pine-importer.c:515
-msgid "Evolution Pine importer"
-msgstr "ìëëì PINE êììê"
+#: ../mail/mail-config.ui.h:103
+msgid "Check incoming _messages for junk"
+msgstr "ëì ëìì ìí ëììì êì(_M)"
 
-#: ../mail/importers/pine-importer.c:516
-msgid "Import mail from Pine."
-msgstr "PINEìì ëìì êììëë."
+#: ../mail/mail-config.ui.h:104
+msgid "Delete junk messages on e_xit"
+msgstr "ëë ë ìí ëì ìì(_X)"
 
-#: ../mail/mail-autofilter.c:73
-#, c-format
-msgid "Mail to %s"
-msgstr "%sì ëëë ëì"
+#: ../mail/mail-config.ui.h:105
+msgid "Check cu_stom headers for junk"
+msgstr "ìí ëì êìì ììì ìì íë êì(_S)"
 
-#: ../mail/mail-autofilter.c:229 ../mail/mail-autofilter.c:272
-#, c-format
-msgid "Mail from %s"
-msgstr "%sìì ì ëì"
+#: ../mail/mail-config.ui.h:106
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr "ëë ìëì ììëì ëì ììë ìíëìë íìíì ìê(_K)"
 
-#: ../mail/mail-autofilter.c:255
-#, c-format
-msgid "Subject is %s"
-msgstr "ìëì %s"
+#: ../mail/mail-config.ui.h:107
+msgid "_Lookup in local address book only"
+msgstr "ëì ììëë ìì ëê(_L)"
 
-#: ../mail/mail-autofilter.c:296
-#, c-format
-msgid "%s mailing list"
-msgstr "%s ëìë ëìí"
+#: ../mail/mail-config.ui.h:108
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "ììì ìì ìí ëì íëê ììë ì ììì ëìíëë."
 
-#: ../mail/mail-autofilter.c:406
-msgid "Add Filter Rule"
-msgstr "íí êì ìê"
+#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:3
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:237
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:161
+msgid "No encryption"
+msgstr "ìíí ìì"
 
-#. Translators: The first %s is name of the affected
-#. * filter rule(s), the second %s is URI of the removed
-#. * 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:513
-#, c-format
-msgid ""
-"The filter rule \"%s\" has been modified to account for the deleted folder\n"
-"\"%s\"."
-msgid_plural ""
-"The following filter rules\n"
-"%s have been modified to account for the deleted folder\n"
-"\"%s\"."
-msgstr[0] ""
-"ëì íí êì:\n"
-"%s êìì ìëìííìëë. ì êìì ë ìêí ëì íëë ììíìëë:\n"
-"\"%s\""
+#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
+msgid "TLS encryption"
+msgstr "TLS ìíí"
 
-#: ../mail/mail-config.ui.h:1
-msgid "Set custom junk header"
-msgstr "ììì ìì ìí ëì íë ìì"
+#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
+msgid "SSL encryption"
+msgstr "SSL ìíí"
 
-#: ../mail/mail-config.ui.h:2
+#: ../mail/mail-dialogs.ui.h:1
 msgid ""
-"All new emails with header that matches given content will be automatically "
-"filtered as junk"
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"íë íë ëìì ìíëìë ííëíê ëë íëê ìë ëë ì ììëì"
+"ëìì ìê ìì íëêë íìíëê ìíí ëìììëë.\n"
+"\"íëê\" ëëìì ìê ìì ëìì ìííììì."
 
-#: ../mail/mail-config.ui.h:3
-msgid "Header name"
-msgstr "íë ìë"
+#: ../mail/mail-dialogs.ui.h:3
+msgid "_Flag:"
+msgstr "íì(_F):"
 
-#: ../mail/mail-config.ui.h:4
-msgid "Header content"
-msgstr "íë ëì"
+#: ../mail/mail-dialogs.ui.h:4
+msgid "_Due By:"
+msgstr "ëê(_D):"
 
-#: ../mail/mail-config.ui.h:5
-msgid "_Add Signature"
-msgstr "ìë ìê(_A)"
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Co_mpleted"
+msgstr "ìëë(_M)"
 
-#: ../mail/mail-config.ui.h:6
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-"ëì ìíëíì ìëì ìëìë ììíëë.\n"
-"ììíë ìëì íì ëììëë ììíëë."
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Call"
+msgstr "íì"
 
-#: ../mail/mail-config.ui.h:10
-msgid "_Script:"
-msgstr "ìíëí(_S):"
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "ìëíì ìì"
 
-#: ../mail/mail-config.ui.h:11
-msgid "Default Behavior"
-msgstr "êë ëì"
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Follow-Up"
+msgstr "ìê ìì"
 
-#: ../mail/mail-config.ui.h:12
-msgid "For_mat messages in HTML"
-msgstr "ëììë HTML íììë(_M)"
+#: ../mail/mail-dialogs.ui.h:10
+msgid "For Your Information"
+msgstr "ììí ìë"
 
-#: ../mail/mail-config.ui.h:13
-msgid "Automatically insert _emoticon images"
-msgstr "ìëìë ìëíì êë ëê(_E)"
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Forward"
+msgstr "ìë"
 
-# read receipt -> ëì ìì íì, Microsoft Office XP ìê
-#: ../mail/mail-config.ui.h:14
-msgid "Always request rea_d receipt"
-msgstr "íì ëì ìì íì ìì(_D)"
+#: ../mail/mail-dialogs.ui.h:12
+msgid "No Response Necessary"
+msgstr "íìì íì ìì"
 
-#: ../mail/mail-config.ui.h:15
-msgid "Encode filenames in an _Outlook/GMail way"
-msgstr "íì ìëì ììë/ìëì ëììë ììë(_O)"
+#: ../mail/mail-dialogs.ui.h:16
+msgid "Reply to All"
+msgstr "ìì íì"
 
-#: ../mail/mail-config.ui.h:16
-msgid "Ch_aracter encoding:"
-msgstr "ëì ììë(_A):"
+#: ../mail/mail-dialogs.ui.h:17
+msgid "Review"
+msgstr "ëì ëê"
 
-#: ../mail/mail-config.ui.h:17
-msgid "Replies and Forwards"
-msgstr "íì ë ìë"
+#: ../mail/mail-dialogs.ui.h:18
+msgid "License Agreement"
+msgstr "ììê ìê"
 
-#: ../mail/mail-config.ui.h:18
-msgid "_Reply style:"
-msgstr "íì ëì(_R):"
+#: ../mail/mail-dialogs.ui.h:19
+msgid "_Tick this to accept the license agreement"
+msgstr "ììê ìêì ëìíìë ìêì ìííììì(_T)"
 
-#: ../mail/mail-config.ui.h:19
-msgid "_Forward style:"
-msgstr "ìë ëì(_F):"
-
-#: ../mail/mail-config.ui.h:20
-msgid "Start _typing at the bottom on replying"
-msgstr "íìí ë ë ìëëí ìë ìì(_T)"
-
-#: ../mail/mail-config.ui.h:21
-msgid "_Keep signature above the original message on replying"
-msgstr "íìí ë ìë ìì ìë ëê(_K)"
-
-#: ../mail/mail-config.ui.h:22
-msgid "Ig_nore Reply-To: for mailing lists"
-msgstr "ëìë ëìíìì Reply-To: ëì(_N)"
-
-#: ../mail/mail-config.ui.h:23
-msgid "Gro_up Reply goes only to mailing list, if possible"
-msgstr "êë íìì (êëí êì) ëìë ëìíìë íì(_U)"
-
-#: ../mail/mail-config.ui.h:24
-msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
-msgstr "ìëì ìëëì ììë ëìí ìëíê (PGP ëë S/MIME)(_S)"
-
-#: ../mail/mail-config.ui.h:26
-msgid "Sig_natures"
-msgstr "ìë(_N)"
-
-#: ../mail/mail-config.ui.h:28
-msgid "Signatures"
-msgstr "ìë"
-
-#: ../mail/mail-config.ui.h:29
-msgid "_Languages"
-msgstr "ìì(_L)"
-
-#: ../mail/mail-config.ui.h:30
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "ì ìì ëëì ììì ììí ììë ëì ììëë."
-
-#: ../mail/mail-config.ui.h:31
-msgid "Languages Table"
-msgstr "ìì í"
-
-#: ../mail/mail-config.ui.h:33
-msgid "Check spelling while I _type"
-msgstr "ìëí ë ëìë êì(_T)"
-
-#: ../mail/mail-config.ui.h:34
-msgid "Color for _misspelled words:"
-msgstr "ëìëì íë êìì ì(_M):"
-
-#: ../mail/mail-config.ui.h:35
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "ìì êëììì"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Spell Checking"
-msgstr "ëìë êì"
-
-#: ../mail/mail-config.ui.h:37
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-msgstr ""
-"ëìì ììë ëëêë êëí ëìì ëëì ìëë, ëì ëìì ëí íì ì"
-"ëì íëë:"
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
-msgid "Sending a message with an _empty subject line"
-msgstr "ìëì ìì ëììë ëëê(_E)"
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
-msgid "Sending a message with only _Bcc recipients defined"
-msgstr "ìì ììëë ëììë ëëê(_B)"
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
-msgid "Sending a _private reply to a mailing list message"
-msgstr "ëìë ëìí ëììì êì íì ëëê(_P)"
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
-msgid "Sending a reply to a large _number of recipients"
-msgstr "ìë ëì ììììê íìì ëëê(_N)"
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
-msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr "ëìë ëìíìì êì íìì ëìíë ëëê íì(_M)"
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
-msgid "Sending a message with _recipients not entered as mail addresses"
-msgstr "ëì ììë ìëíì ìì ììììê ëìì ëëê(_R){0}"
-
-#: ../mail/mail-config.ui.h:50
-msgid "Confirmations"
-msgstr "íì"
-
-#: ../mail/mail-config.ui.h:52
-msgid "SHA1"
-msgstr "SHA1"
-
-#: ../mail/mail-config.ui.h:53
-msgid "SHA256"
-msgstr "SHA256"
-
-#: ../mail/mail-config.ui.h:54
-msgid "SHA384"
-msgstr "SHA384"
-
-#: ../mail/mail-config.ui.h:55
-msgid "SHA512"
-msgstr "SHA512"
-
-# FIXME: wrong msgid - list model
-#: ../mail/mail-config.ui.h:56 ../smime/gui/smime-ui.ui.h:1
-msgid "a"
-msgstr "a"
-
-# FIXME: wrong msgid - list model
-#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
-msgid "b"
-msgstr "b"
-
-#: ../mail/mail-config.ui.h:58
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "ìë"
-
-#: ../mail/mail-config.ui.h:59
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "íí (Outlook ëì)"
-
-#: ../mail/mail-config.ui.h:60
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "ìì"
-
-#: ../mail/mail-config.ui.h:61
-msgctxt "ReplyForward"
-msgid "Do not quote"
-msgstr "ììíì ìê"
-
-#: ../mail/mail-config.ui.h:62
-msgctxt "ReplyForward"
-msgid "Inline"
-msgstr "íí"
-
-#: ../mail/mail-config.ui.h:63
-msgid "Proxy Settings"
-msgstr "íëì ìì"
-
-#: ../mail/mail-config.ui.h:64
-msgid "_Use system defaults"
-msgstr "ììí êëê ìì(_U)"
-
-#: ../mail/mail-config.ui.h:65
-msgid "_Direct connection to the Internet"
-msgstr "ìíëì ìì ìê(_D)"
-
-#: ../mail/mail-config.ui.h:66
-msgid "_Manual proxy configuration:"
-msgstr "ìë íëì ìì(_M):"
-
-#: ../mail/mail-config.ui.h:67
-msgid "H_TTP Proxy:"
-msgstr "HTTP íëì(_T):"
-
-#: ../mail/mail-config.ui.h:68
-msgid "_Secure HTTP Proxy:"
-msgstr "ëì HTTP íëì(_S):"
-
-#: ../mail/mail-config.ui.h:69
-msgid "SOC_KS Proxy:"
-msgstr "SOCKS íëì(_K):"
-
-#: ../mail/mail-config.ui.h:70
-msgid "No _Proxy for:"
-msgstr "íëì ìë íìí(_P):"
-
-#: ../mail/mail-config.ui.h:71
-msgid "Port:"
-msgstr "íí:"
-
-#: ../mail/mail-config.ui.h:72
-msgid "Use Authe_ntication"
-msgstr "ìì ìì(_N)"
-
-#: ../mail/mail-config.ui.h:73
-msgid "Us_ername:"
-msgstr "ììììë(_E):"
-
-#: ../mail/mail-config.ui.h:74
-msgid "Pass_word:"
-msgstr "ìí(_W):"
-
-#: ../mail/mail-config.ui.h:75
-msgid "Start up"
-msgstr "ìì"
-
-#: ../mail/mail-config.ui.h:76
-msgid "Check for new _messages on start"
-msgstr "ììí ë ì ëìì íì(_M)"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../mail/mail-config.ui.h:77
-msgid "Check for new messa_ges in all active accounts"
-msgstr "ìì ìì ëë êììì ì ëìì íì(_G)"
-
-#: ../mail/mail-config.ui.h:78
-msgid "Message Display"
-msgstr "ëìì íì"
-
-#: ../mail/mail-config.ui.h:79
-msgid "_Use the same fonts as other applications"
-msgstr "ëë íëêëê êì êê ìì(_U)"
-
-#: ../mail/mail-config.ui.h:80
-msgid "S_tandard Font:"
-msgstr "ìë êê(_T):"
-
-#: ../mail/mail-config.ui.h:81
-msgid "Select HTML fixed width font"
-msgstr "HTML êìí êêì ìííììì"
-
-#: ../mail/mail-config.ui.h:82
-msgid "Select HTML variable width font"
-msgstr "HTML êëí êêì ìííììì"
-
-#: ../mail/mail-config.ui.h:83
-msgid "Fix_ed Width Font:"
-msgstr "êìí êê(_E):"
-
-#: ../mail/mail-config.ui.h:84
-msgid "Highlight _quotations with"
-msgstr "ììëì ëì ìêë íì(_Q):"
-
-#: ../mail/mail-config.ui.h:85
-msgid "color"
-msgstr "ìì"
-
-#: ../mail/mail-config.ui.h:86
-msgid "Default character e_ncoding:"
-msgstr "êë ëì ììë(_N):"
-
-#: ../mail/mail-config.ui.h:87
-msgid "Apply the same _view settings to all folders"
-msgstr "ëë íëì êì ëê ìì ìì(_V)"
-
-#: ../mail/mail-config.ui.h:88
-msgid "F_all back to threading messages by subject"
-msgstr "ìêë ëììê ìëëëë ìëì ëë êíëë ëëê(_A)"
-
-#: ../mail/mail-config.ui.h:89
-msgid "Delete Mail"
-msgstr "ëì ìì"
-
-#: ../mail/mail-config.ui.h:90
-msgid "Empty trash folders on e_xit"
-msgstr "ëë ë íìí íë ëìê(_X): "
-
-#: ../mail/mail-config.ui.h:91
-msgid "Confirm _when expunging a folder"
-msgstr "íëë ëì ë íì ìë(_W)"
-
-#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
-msgid "_Show animated images"
-msgstr "ìëëìì íì(_S)"
-
-#: ../mail/mail-config.ui.h:94
-msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr "HTML ëìì ëê ìì ìì ìëíí ëë ë íì ìë(_P)"
-
-# ìí ìíê ìëë ìì ìì ìë, "~íë ì"ìë ëìíì ë ê
-#: ../mail/mail-config.ui.h:95
-msgid "Loading Images"
-msgstr "êë ììëìê"
-
-#: ../mail/mail-config.ui.h:96
-msgid "_Never load images from the Internet"
-msgstr "êëì ìíëìì ììëìì ìê(_N)"
-
-#: ../mail/mail-config.ui.h:97
-msgid "_Load images only in messages from contacts"
-msgstr "ëëìê ìëìì ëì ìë ëììììë êë ììëìê(_L)"
-
-#: ../mail/mail-config.ui.h:98
-msgid "_Always load images from the Internet"
-msgstr "íì ìíëìì êë ììëìê(_A)"
-
-#: ../mail/mail-config.ui.h:99
-msgid "HTML Messages"
-msgstr "HTML ëìì"
-
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
-msgid "Labels"
-msgstr "ëìë"
-
-#: ../mail/mail-config.ui.h:101
-msgid "Sender Photograph"
-msgstr "ëëë ìë ìì"
-
-#: ../mail/mail-config.ui.h:102
-msgid "_Show the photograph of sender in the message preview"
-msgstr "ëì ëë ëêìì ëë ìëì ìì ëìê(_S)"
-
-#: ../mail/mail-config.ui.h:103
-msgid "S_earch for sender photograph only in local address books"
-msgstr "ëì ììëììë ëë ìëì ìì êì(_E)"
-
-#: ../mail/mail-config.ui.h:104
-msgid "Displayed Message Headers"
-msgstr "íìíë ëìì íë"
-
-#: ../mail/mail-config.ui.h:105
-msgid "Mail Headers Table"
-msgstr "ëì íë í"
-
-#: ../mail/mail-config.ui.h:106
-#: ../modules/addressbook/autocompletion-config.c:188
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
-msgid "Date/Time Format"
-msgstr "ëì/ìê íì"
-
-#: ../mail/mail-config.ui.h:107
-msgid "Headers"
-msgstr "íë"
-
-#: ../mail/mail-config.ui.h:108
-msgid "Check incoming _messages for junk"
-msgstr "ëì ëìì ìí ëììì êì(_M)"
-
-#: ../mail/mail-config.ui.h:109
-msgid "Delete junk messages on e_xit"
-msgstr "ëë ë ìí ëì ìì(_X)"
-
-#: ../mail/mail-config.ui.h:110
-msgid "Check cu_stom headers for junk"
-msgstr "ìí ëì êìì ììì ìì íë êì(_S)"
-
-#: ../mail/mail-config.ui.h:111
-msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr "ëë ìëì ììëì ëì ììë ìíëìë íìíì ìê(_K)"
-
-#: ../mail/mail-config.ui.h:112
-msgid "_Lookup in local address book only"
-msgstr "ëì ììëë ìì ëê(_L)"
-
-#: ../mail/mail-config.ui.h:113
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "ììì ìì ìí ëì íëê ììë ì ììì ëìíëë."
-
-#: ../mail/mail-config.ui.h:115 ../modules/addressbook/ldap-config.ui.h:3
-msgid "No encryption"
-msgstr "ìíí ìì"
-
-#: ../mail/mail-config.ui.h:116 ../modules/addressbook/ldap-config.ui.h:1
-msgid "TLS encryption"
-msgstr "TLS ìíí"
-
-#: ../mail/mail-config.ui.h:117 ../modules/addressbook/ldap-config.ui.h:2
-msgid "SSL encryption"
-msgstr "SSL ìíí"
-
-#: ../mail/mail-config.ui.h:118
-msgid "Special Folders"
-msgstr "íì íë"
-
-#: ../mail/mail-config.ui.h:119
-msgid "Drafts _Folder:"
-msgstr "ìì ëêí íë(_F):"
-
-#: ../mail/mail-config.ui.h:120
-msgid "Sent _Messages Folder:"
-msgstr "ëë ëìì íë(_M):"
-
-#: ../mail/mail-config.ui.h:121
-msgid "_Trash Folder:"
-msgstr "ìì ëìì íë(_T):"
-
-#: ../mail/mail-config.ui.h:122
-msgid "_Junk Folder:"
-msgstr "ìíëì íë(_J):"
-
-# ìí ìíê ìëë ìì ìì ìë, "~íë ì"ìë ëìíì ë ê
-#: ../mail/mail-config.ui.h:123
-msgid "Composing Messages"
-msgstr "ëìì ìì"
-
-#: ../mail/mail-config.ui.h:124
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "íì ìì ìì(BCC) (_B):"
-
-#: ../mail/mail-config.ui.h:125
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "íì ìì(CC) (_S):"
-
-#: ../mail/mail-config.ui.h:126
-msgid "Message Receipts"
-msgstr "ëìì ëì ìì íì"
-
-#: ../mail/mail-config.ui.h:127
-msgid "S_end message receipts:"
-msgstr "ëìì ìì íì ëëê(_E):"
-
-#: ../mail/mail-config.ui.h:128
-msgid "Account Information"
-msgstr "êì ìë"
-
-#: ../mail/mail-config.ui.h:129
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-"ì êìì ì ìëì ìëíììì.\n"
-"ì: \"ììì\" ëë \"êìì\""
-
-#: ../mail/mail-config.ui.h:131
-msgid "Required Information"
-msgstr "íì ìë"
-
-#: ../mail/mail-config.ui.h:132
-msgid "Email _Address:"
-msgstr "ììëì ìì(_A):"
-
-#: ../mail/mail-config.ui.h:133
-msgid "Full Nam_e:"
-msgstr "ìì ìë(_E):"
-
-#: ../mail/mail-config.ui.h:134
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "Optional Information"
-msgstr "ìê ìë"
-
-#: ../mail/mail-config.ui.h:135
-msgid "Signat_ure:"
-msgstr "ìë(_U):"
-
-#: ../mail/mail-config.ui.h:136
-msgid "Add Ne_w Signature..."
-msgstr "ì ìë ìê(_W)..."
-
-#: ../mail/mail-config.ui.h:137
-msgid "Or_ganization:"
-msgstr "ìì(_G):"
-
-#: ../mail/mail-config.ui.h:138
-msgid "Re_ply-To:"
-msgstr "íì ìì(_P):"
-
-#: ../mail/mail-config.ui.h:139
-msgid "_Make this my default account"
-msgstr "ë êë êììë íê(_M)"
-
-#: ../mail/mail-config.ui.h:140
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "ëì ììì ìëíì ìê (Outlook íí)(_D)"
-
-#: ../mail/mail-config.ui.h:141
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
-
-#: ../mail/mail-config.ui.h:142
-msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG í ID(_K):"
-
-#: ../mail/mail-config.ui.h:143
-msgid "Si_gning algorithm:"
-msgstr "ìë ìêëì(_G):"
-
-#: ../mail/mail-config.ui.h:144
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "ì êììë ëëë ëììë íì ìë(_W)"
-
-#: ../mail/mail-config.ui.h:145
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "ìííí ëìì ëë ë ììì ëíì ììë ìíí(_M)"
-
-#: ../mail/mail-config.ui.h:146
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "ìííí ë ë í ëìì ëì ìë íë ììë ìë(_T)"
-
-#: ../mail/mail-config.ui.h:147
-msgid "Secure MIME (S/MIME)"
-msgstr "ëì MIME (S/MIME)"
-
-#: ../mail/mail-config.ui.h:148
-msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "ìííí ëìì ëë ë ììì ëíìë ìíí(_F)"
-
-#: ../mail/mail-config.ui.h:149
-msgid "Encrypt out_going messages (by default)"
-msgstr "ëëë ëìì ìíí (êëêìë)(_G)"
-
-#: ../mail/mail-config.ui.h:150
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "ëëë ëììì (êëêìë) ëìí ìë(_U)"
-
-#: ../mail/mail-config.ui.h:151
-msgid "Encry_ption certificate:"
-msgstr "ìíí ììì(_P):"
-
-#: ../mail/mail-config.ui.h:152
-msgid "Sig_ning certificate:"
-msgstr "ìë ììì(_N):"
-
-#: ../mail/mail-config.ui.h:153
-msgid "S_elect..."
-msgstr "ìí(_E)..."
-
-#: ../mail/mail-config.ui.h:154
-msgid "Clea_r"
-msgstr "ììê(_R)"
-
-#: ../mail/mail-config.ui.h:155
-msgid "Signing _algorithm:"
-msgstr "ìë ìêëì(_A):"
-
-#: ../mail/mail-config.ui.h:157
-msgid "Cle_ar"
-msgstr "ììê(_A)"
-
-#: ../mail/mail-config.ui.h:158
-msgid "Server _Type:"
-msgstr "ìë ìë(_T):"
-
-#: ../mail/mail-config.ui.h:160
-msgid "description"
-msgstr "ìë"
-
-#: ../mail/mail-config.ui.h:161
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "ìì"
-
-#: ../mail/mail-config.ui.h:162
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "ìë(_S):"
-
-#: ../mail/mail-config.ui.h:163 ../plugins/caldav/caldav-source.c:250
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:273
-msgid "User_name:"
-msgstr "ììììë(_N):"
-
-#: ../mail/mail-config.ui.h:165
-msgid "Mailbox location"
-msgstr "ëìí ìì"
-
-#: ../mail/mail-config.ui.h:167
-msgid "_Use secure connection:"
-msgstr "ëì ìê ìì(_U):"
-
-#: ../mail/mail-config.ui.h:168
-msgid "SSL is not supported in this build of Evolution"
-msgstr "ì ìëëì ëëë SSLì ììíì ììëë"
-
-#: ../mail/mail-config.ui.h:169
-msgid "_Authentication Type"
-msgstr "ìì ëë(_A)"
-
-#: ../mail/mail-config.ui.h:170
-msgid "Ch_eck for Supported Types"
-msgstr "ììíë ëì íì(_E)"
-
-#: ../mail/mail-config.ui.h:171
-msgid "Re_member password"
-msgstr "ìí ìì(_M)"
-
-#: ../mail/mail-config.ui.h:172
-msgid "Server Configuration"
-msgstr "ìë ìì"
-
-#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
-msgid "_Port:"
-msgstr "íí(_P):"
-
-#: ../mail/mail-config.ui.h:174
-msgid "Ser_ver requires authentication"
-msgstr "ìëì ììì íì(_V)"
-
-#: ../mail/mail-config.ui.h:175
-#: ../modules/addressbook/addressbook-config.c:1122
-msgid "Authentication"
-msgstr "ìì"
-
-#: ../mail/mail-config.ui.h:176
-msgid "T_ype:"
-msgstr "ìë(_Y):"
-
-#: ../mail/mail-config.ui.h:177
-msgid "User _Name:"
-msgstr "ììììë(_N):"
-
-#: ../mail/mail-config.ui.h:178
-msgid "Remember _password"
-msgstr "ìí ìì(_P)"
-
-#: ../mail/mail-config.ui.h:179
-msgid "Personal Details:"
-msgstr "êì ìì ìë:"
-
-#: ../mail/mail-config.ui.h:188
-msgid "Encryption:"
-msgstr "ìíí:"
-
-#: ../mail/mail-config.ui.h:189
-msgid "none"
-msgstr "ìì"
-
-#: ../mail/mail-config.ui.h:190
-msgid "label"
-msgstr "ëìë"
-
-#: ../mail/mail-dialogs.ui.h:1
-msgid "Search Folder Sources"
-msgstr "íë ìì êì"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local folders"
-msgstr "ëë ëì íë"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All active remote folders"
-msgstr "ëë íìíí ìê íë"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "All local and active remote folders"
-msgstr "ëë ëì íëì íìíí ìê íë"
-
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Specific folders"
-msgstr "ììí íë"
-
-#: ../mail/mail-dialogs.ui.h:6
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"ëìì ìê ìì íëêë íìíëê ìíí ëìììëë.\n"
-"\"íëê\" ëëìì ìê ìì ëìì ìííììì."
-
-#: ../mail/mail-dialogs.ui.h:8
-msgid "_Flag:"
-msgstr "íì(_F):"
-
-#: ../mail/mail-dialogs.ui.h:9
-msgid "_Due By:"
-msgstr "ëê(_D):"
-
-#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Co_mpleted"
-msgstr "ìëë(_M)"
-
-#: ../mail/mail-dialogs.ui.h:12
-msgid "Call"
-msgstr "íì"
-
-#: ../mail/mail-dialogs.ui.h:13
-msgid "Do Not Forward"
-msgstr "ìëíì ìì"
-
-#: ../mail/mail-dialogs.ui.h:14
-msgid "Follow-Up"
-msgstr "ìê ìì"
-
-#: ../mail/mail-dialogs.ui.h:15
-msgid "For Your Information"
-msgstr "ììí ìë"
-
-#: ../mail/mail-dialogs.ui.h:16
-msgid "Forward"
-msgstr "ìë"
-
-#: ../mail/mail-dialogs.ui.h:17
-msgid "No Response Necessary"
-msgstr "íìì íì ìì"
+#: ../mail/mail-dialogs.ui.h:20
+msgid "_Accept License"
+msgstr "ììê ëì(_A)"
 
 #: ../mail/mail-dialogs.ui.h:21
-msgid "Reply to All"
-msgstr "ìì íì"
-
-#: ../mail/mail-dialogs.ui.h:22
-msgid "Review"
-msgstr "ëì ëê"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid "License Agreement"
-msgstr "ììê ìê"
-
-#: ../mail/mail-dialogs.ui.h:24
-msgid "_Tick this to accept the license agreement"
-msgstr "ììê ìêì ëìíìë ìêì ìííììì(_T)"
-
-#: ../mail/mail-dialogs.ui.h:25
-msgid "_Accept License"
-msgstr "ììê ëì(_A)"
-
-#: ../mail/mail-dialogs.ui.h:26
 msgid "Security Information"
 msgstr "ëì ìë"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Digital Signature"
 msgstr "ëìí ìë"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Encryption"
 msgstr "ìíí"
 
@@ -14303,7 +13299,7 @@ msgid ""
 msgstr "ëë íëì ììí ëììë ììí ìêíìêìëê?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "_Empty Trash"
 msgstr "ìì ëìì ëìê(_E)"
 
@@ -14385,14 +13381,22 @@ msgstr ""
 "êë, ìêêë, ììíë ì ëëë."
 
 #: ../mail/mail.error.xml.h:60
+msgid "Failed to expunge folder &quot;{0}&quot;."
+msgstr "&quot;{0}&quot; íëë ìì ììíëë ìííìëë."
+
+#: ../mail/mail.error.xml.h:62
+msgid "Failed to refresh folder &quot;{0}&quot;."
+msgstr "&quot;{0}&quot; íëë ìë êìëë ìííìëë."
+
+#: ../mail/mail.error.xml.h:63
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "\"{0}\" ììí íëì ìëì ëêêë ìê ì ììëë."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ìëë \"{0}\" íëì ê ìë íëë ëë ììíìêìëê?"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -14400,20 +13404,20 @@ msgstr ""
 "ì íëë ììíë, ê ìì ìë ëìê ê íì íëì ëìêì ììí ììí"
 "ê ëëë."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\"?"
 msgstr "ìëë \"{0}\" íëë ììíìêìëê?"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "ì íëë ììíë, ê ìì ìë ëìêì ììí ììíê ëëë."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 msgid "These messages are not copies."
 msgstr "ì ëììë ëìëì ìëëë."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -14423,115 +13427,91 @@ msgstr ""
 "ììíë ëëìì ììì ëì ìë ìì ëììë ììíëë. ìëë ëììë "
 "ììíìêìëê?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\"ì(ë) \"{1}\"(ì)ë ìëì ëêì ëíìëë."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "\"{1}\"(ì)ëë ìëì íëê ìë ììëë. ëë ìëì ììíììì."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" íëë \"{1}\"ì ìêì ëíìëë."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot open source \"{2}\"."
 msgstr "\"{2}\" ììë ì ì ììëë."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open target \"{2}\"."
 msgstr "\"{2}\" ëìì ì ì ììëë."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" íëë \"{1}\"ì ëìí ì ììëë."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot create folder \"{0}\"."
 msgstr "\"{0}\" íëë ëë ì ììëë."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open source \"{1}\"."
 msgstr "\"{1}\" ììë ì ì ììëë."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot save changes to account."
 msgstr "ëë ìíì êìì ììí ì ììëë."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "You have not filled in all of the required information."
 msgstr "íìí ìëìì ìëíì ìì ìëê ììëë."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "You may not create two accounts with the same name."
 msgstr "êì ìëìë ë êì êìì ëë ì ììëë."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Are you sure you want to delete this account?"
 msgstr "ìëë ì êìì ììíìêìëê?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "êì íìë, êì ìëë ììí ììíëë."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "ìëë ì êìê ê íëìë ëë ììíìêìëê?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr "êì íìë, êìê ëë íëìì ìëë ììí ììíëë."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "ìëë ì êìì ììíì ìê ê íëìë ëë ììíìêìëê?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "êìíìë, ëë íëì êìì ììí ììíëë."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Do _Not Disable"
 msgstr "íìíì ìê(_N)"
 
-#: ../mail/mail.error.xml.h:87
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../mail/mail.error.xml.h:90
+#: ../plugins/publish-calendar/publish-calendar.c:626
 msgid "_Disable"
 msgstr "ìì ìì(_D)"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Could not save signature file."
-msgstr "ìë íìì ììí ì ììëë."
-
-#: ../mail/mail.error.xml.h:89
-msgid "Cannot set signature script \"{0}\"."
-msgstr "\"{0}\" ìë ìíëíë ììí ì ììëë."
-
-#: ../mail/mail.error.xml.h:90
-msgid "The script file must exist and be executable."
-msgstr "ìíëí íìì ììì íê ìíí ì ììì íëë."
-
 #: ../mail/mail.error.xml.h:91
-msgid "Do you wish to save your changes?"
-msgstr "ëë ëìì ììíìêìëê?"
-
-#: ../mail/mail.error.xml.h:92
-msgid "This signature has been changed, but has not been saved."
-msgstr "ìëì ëëììë, ììíì ìììëë."
-
-#: ../mail/mail.error.xml.h:93
-msgid "_Discard changes"
-msgstr "ëë ëì ëëê(_D)"
-
-#: ../mail/mail.error.xml.h:94
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "\"{0}\" êì íëë íìí ì ììëë: íëê ììëë."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14539,39 +13519,39 @@ msgstr ""
 "ì íëë ëìììë ìêí íëì ìë ììëë.\n"
 "íìíëë êì íë íì ììë êì ìì ìêíììì."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "\"{0}\" êì íëë ìêí ì ììëë."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:95
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "\"{0}\"(ì)ëë ìëì íëê ìë ììëë. ëë ìëì ììíììì."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:96
 msgid "Search Folders automatically updated."
 msgstr "êì íëë ìëìë ìëìííìëë."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:97
 msgid "Mail filters automatically updated."
 msgstr "ëì ííë ìëìë ìëìííìëë."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:98
 msgid "Missing folder."
 msgstr "íëê ëììëë."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:99
 msgid "You must specify a folder."
 msgstr "íëë ììíì íëë."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:101
 msgid "You must name this Search Folder."
 msgstr "ì êì íëì ìëì ìíì íëë."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:102
 msgid "No sources selected."
 msgstr "ììë ìííì ìììëë."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14581,11 +13561,11 @@ msgstr ""
 "íëë íëì ìííìêë, ìëë ëë ëì íë, ëë ìê íë, ìëë ì"
 "ëë ìíí ì ììëë."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:105
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "êêì \"{0}\" ëì íëìì ìêìëë ëìê ëìíìëë."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -14597,23 +13577,23 @@ msgstr ""
 "ì íëë ëìí ìë ìê, ëì ìêë, ê ëì ëì ëëìêë, ëë ì ì"
 "ìëë."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "ëì"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "ëì ìê(_O)"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "_Append"
 msgstr "ëëìê(_A)"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid "Evolution's local mail format has changed."
 msgstr "ìëëìì ëì ëì íìì ëëììëë."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -14630,19 +13610,19 @@ msgstr ""
 "ëìëê íìíëë ì mbox êìì ììíë ììëë. ìê ëííìëë ëì "
 "ëìí êêì ëëíì íìíììì."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "_Exit Evolution"
 msgstr "ìëëì ëêê(_E)"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "_Migrate Now"
 msgstr "ìê ìêê(_M)"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "Unable to read license file."
 msgstr "ììêí íìì ìì ì ììëë."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -14650,317 +13630,329 @@ msgstr ""
 "\"{0}\" ëììì íìì ìì ì ììëë, ìì ëì ëëìëë. ì ëììì"
 "ì ëìíê ììë ì ìêìë ììí ì ììëë."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "Please wait."
 msgstr "ìì êëëììì."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ìëì ììíë ìì ëì ëë ëìëê."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr "ìëì ììíë ìì ëì ëë ëìëêì ìííìëë."
 
-#: ../mail/mail.error.xml.h:126
-msgid "Unable to connect to the GroupWise server."
-msgstr "êëììì ìëì ìêí ì ììëë."
-
-#: ../mail/mail.error.xml.h:127
-msgid "Please check your account settings and try again."
-msgstr "êì ììì íìíê ëì ìëí ëììì."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:123
 msgid "Synchronize folders locally for offline usage?"
 msgstr "ìê ìì ìíìì ììíê ìí íëë ëììì ëêííìêìëê?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "ìê ìì ìí ìììëê íìí íëë ëìì ëêííìêìëê?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:125
 msgid "Do _Not Synchronize"
 msgstr "ëêííì ìê(_N)"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:126
 msgid "_Synchronize"
 msgstr "ëêí(_S)"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:127
 msgid "Do you want to mark all messages as read?"
 msgstr "ëë ëììë ìì êìë íìíêì?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:128
 msgid "This will mark all messages as read in the selected folder."
 msgstr "ìíí íëì ëë ëììë ìì êìë íìíëë."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "ìíí íëì ê ìë íëì ëë ëììë ìì êìë íìíëë."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:130
 msgid "Close message window."
 msgstr "ëìì ìì ëìëë."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:131
 msgid "Would you like to close the message window?"
 msgstr "ëìì ìì ëììêìëê?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:132
 msgid "_Yes"
 msgstr "ì(_Y)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:133
 msgid "_No"
 msgstr "ìëì(_N)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:134
 msgid "_Always"
 msgstr "íì(_A)"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:135
 msgid "N_ever"
 msgstr "ì í(_E)"
 
-#: ../mail/mail.error.xml.h:141
-msgid "Signature Already Exists"
-msgstr "ìëì ìë ììëë"
+#: ../mail/mail.error.xml.h:136
+msgid "Copy folder in folder tree."
+msgstr "íëë íë íëì ëì."
 
-#: ../mail/mail.error.xml.h:142
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr "\"{1}\"(ì)ëë ìëì ìëì ìë ììëë. ëë ìëì ììíììì."
+#: ../mail/mail.error.xml.h:137
+msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+msgstr "ìëë '{0}' íëë '{1}' íëë ëìíìêìëê?"
 
-#: ../mail/mail.error.xml.h:143
-msgid "Blank Signature"
-msgstr "ìë ìì"
+#: ../mail/mail.error.xml.h:138
+msgid "Move folder in folder tree."
+msgstr "íëë íë íëì ìêê."
 
-#: ../mail/mail.error.xml.h:144
-msgid "Please provide an unique name to identify this signature."
-msgstr "ì ìëì êëí ì ìë êìí ìëì ìëíììì."
+#: ../mail/mail.error.xml.h:139
+msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+msgstr "ìëë '{0}' íëë '{1}' íëë ìêìêìëê?"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:140
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "ììí êìì ììíë ìì ìëëë ì ëììë ëë ì ììëë."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:141
 msgid "Please enable the account or send using another account."
 msgstr "êìì ììíëë ëëêë ëë êììë ëë ëììì."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:142
 msgid "Mail Deletion Failed"
 msgstr "ëì ììê ìííìëë"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:143
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ì ëìì ìì êíì ììëë."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:144
 msgid "\"Check Junk\" Failed"
 msgstr "\"ìíëì êì\" ìí"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:145
 msgid "\"Report Junk\" Failed"
 msgstr "\"ìíëì ìë\" ìí"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:146
 msgid "\"Report Not Junk\" Failed"
 msgstr "\"ìíëì ìë ìë\" ìí"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:147
 msgid "Remove duplicate messages?"
 msgstr "ìë ëììë ìêíìêìëê?"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:148
 msgid "No duplicate messages found."
 msgstr "ìëë ëììê ììëë."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:150
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "'{0}' íëì ìë ëììê ììëë."
 
-#: ../mail/mail.error.xml.h:156
-msgid "Failed to unsubscribe from folder."
-msgstr "íë êë íìì ìííìëë."
+#: ../mail/mail.error.xml.h:151
+msgid "Failed to disconnect account &quot;{0}&quot;."
+msgstr "&quot;{0}&quot; êìì ìêì ëëë ìííìëë."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:153
+msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgstr "&quot;{0}&quot; íë êë íìì ìííìëë."
+
+#: ../mail/mail.error.xml.h:154
 msgid "Unable to retrieve message."
 msgstr "ëììë êìì ì ììëë."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:155
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to open folder."
 msgstr "íëë ìëë ìííìëë."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to find duplicate messages."
 msgstr "ìë ëììë ìëë ìííìëë."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:158
 msgid "Failed to retrieve messages."
 msgstr "ëììë êììëë ìííìëë."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:159
 msgid "Failed to remove attachments from messages."
 msgstr "ëìììì ìë íìì ìêíëë ìííìëë."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to download messages for offline viewing."
 msgstr "ìê ìì ìí ìì ìëë ëìì ëìëëì ìííìëë."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to save messages to disk."
 msgstr "ëììë ëìíì ììíëë ìííìëë."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:162
 msgid "Hidden file is attached."
 msgstr "ìê íìì ìëíìëë."
 
-#: ../mail/mail.error.xml.h:167
-msgid ""
-"The attachment named {0} is a hidden file and may contain sensitive data. "
-"Please review it before sending."
-msgstr "ìëì {0}ì ìë íìì ìê íììëë ëêí ëìíê ëì ìì ìë ììëë. ëëê ìì íìíììì."
+#: ../mail/mail.error.xml.h:163
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr ""
+"ìëì {0}ì ìë íìì ìê íììëë ëêí ëìíê ëì ìì ìë ìì"
+"ëë. ëëê ìì íìíììì."
+
+#: ../mail/mail.error.xml.h:164
+msgid "Printing failed."
+msgstr "ìì ìí."
+
+#: ../mail/mail.error.xml.h:165
+msgid "The printer replied &quot;{0}&quot;."
+msgstr "íëí ìëì &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:166
+msgid "Could not perform this operation on {0}."
+msgstr "ì ììì {0}ì ìíí ì ììëë."
 
-#: ../mail/mail-send-recv.c:207
+#: ../mail/mail-send-recv.c:203
 msgid "Canceling..."
 msgstr "ììíë ì..."
 
-#: ../mail/mail-send-recv.c:534
+#: ../mail/mail-send-recv.c:547
 msgid "Send & Receive Mail"
 msgstr "ëì ëëê ëê"
 
-#: ../mail/mail-send-recv.c:550
+#: ../mail/mail-send-recv.c:563
 msgid "Cancel _All"
 msgstr "ëë ìì(_A)"
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:1029
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
 msgid "Updating..."
 msgstr "ìëìí ì..."
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:737
 msgid "Waiting..."
 msgstr "êëëë ì..."
 
-#: ../mail/mail-send-recv.c:1009
+#: ../mail/mail-send-recv.c:1020
 #, c-format
 msgid "Checking for new mail"
 msgstr "ì ëì íì"
 
+#: ../mail/mail-vfolder-ui.c:79
+msgid "Search Folders"
+msgstr "êì íë"
+
 #: ../mail/mail-vfolder-ui.c:159
 msgid "Edit Search Folder"
 msgstr "êì íë íì"
 
-#: ../mail/mail-vfolder-ui.c:270
+#: ../mail/mail-vfolder-ui.c:280
 msgid "New Search Folder"
 msgstr "ì êì íë"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:1262
 msgid "Unseen"
 msgstr "ëìììì"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:1263
 msgid "Seen"
 msgstr "ëì"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:1264
 msgid "Answered"
 msgstr "ìëí"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:1265
 msgid "Forwarded"
 msgstr "ìëí"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1266
 msgid "Multiple Unseen Messages"
 msgstr "ìëêì ëììì ëìì"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:1267
 msgid "Multiple Messages"
 msgstr "ìë ëìì"
 
-#: ../mail/message-list.c:1281
+#: ../mail/message-list.c:1271
 msgid "Lowest"
 msgstr "êì ëì"
 
-#: ../mail/message-list.c:1282
+#: ../mail/message-list.c:1272
 msgid "Lower"
 msgstr "ëì"
 
-#: ../mail/message-list.c:1286
+#: ../mail/message-list.c:1276
 msgid "Higher"
 msgstr "ëì"
 
-#: ../mail/message-list.c:1287
+#: ../mail/message-list.c:1277
 msgid "Highest"
 msgstr "êì ëì"
 
 # ???
-#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
+#: ../mail/message-list.c:1900 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:208
+#: ../mail/message-list.c:1907 ../modules/itip-formatter/itip-view.c:249
 msgid "Today %l:%M %p"
 msgstr "ìë %p %l:%M"
 
-#: ../mail/message-list.c:1925
+#: ../mail/message-list.c:1916
 msgid "Yesterday %l:%M %p"
 msgstr "ìì %p %l:%M "
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:1928
 msgid "%a %l:%M %p"
 msgstr "(%a) %p %l:%M"
 
-#: ../mail/message-list.c:1945
+#: ../mail/message-list.c:1936
 msgid "%b %d %l:%M %p"
 msgstr "%b %dì %p %l:%M"
 
-#: ../mail/message-list.c:1947
+#: ../mail/message-list.c:1938
 msgid "%b %d %Y"
 msgstr "%Yë %b %dì"
 
-#: ../mail/message-list.c:2752
+#: ../mail/message-list.c:2769
 msgid "Select all visible messages"
 msgstr "ëë ëìë ëìì ìí"
 
-#: ../mail/message-list.c:2888 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2907 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "ëìì"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4101
+#: ../mail/message-list.c:4132
 msgid "Follow-up"
 msgstr "ìê ìì"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4638 ../mail/message-list.c:5058
+#: ../mail/message-list.c:4634 ../mail/message-list.c:5038
 msgid "Generating message list"
 msgstr "ëìì ëë ììì"
 
-#: ../mail/message-list.c:4875
+#: ../mail/message-list.c:4868
 msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
-msgstr ""
-"êì êìì íëíë ëììê ììëë. êì->ììê ëë íëìë ìêë ì"
-"ìêë êì êìì ëêììì."
+"No message satisfies your search criteria. Change search criteria by "
+"selecting a new Show message filter from the drop down list above or by "
+"running a new search either by clearing it with Search->Clear menu item or "
+"by changing the query above."
+msgstr "ìë ëììë ì êì êìì ëìíì ëíëë. ìì ëëëì ëëìì ìë ëìì íì ííë ëëêë, êì->ììê ëë íëìë êìì ëìêë ìì ììë ëêì ìë êìì ìíí êì êìì ëêììì."
 
-#: ../mail/message-list.c:4877
+#: ../mail/message-list.c:4873
 msgid "There are no messages in this folder."
 msgstr "ì íëìë ëììê ììëë."
 
@@ -14972,11 +13964,6 @@ msgstr "íëê"
 msgid "Received"
 msgstr "ëìì"
 
-#: ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
-msgid "Size"
-msgstr "íê"
-
 #: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "íëê ìí"
@@ -15002,521 +13989,406 @@ msgid "Subject or Addresses contains"
 msgstr "ìëìë ììì íí"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Recipients contain"
 msgstr "ëë ìëì íí"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Message contains"
 msgstr "ëììì íí"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Subject contains"
 msgstr "ìëì íí"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Sender contains"
 msgstr "ëë ìëì íí"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Body contains"
 msgstr "ëëì íí"
 
-#: ../modules/addressbook/addressbook-config.c:204
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"ì ììì ìë LDAP ìëê SSLì ììíë êììë ìëëììì ê LDAP ìë"
-"ì ìêíëë."
-
-#: ../modules/addressbook/addressbook-config.c:206
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"ì ììì ìë LDAP ìëê SSLì ììíë êììë ìëëììì ê LDAP ìë"
-"ì ìêíëë."
-
-#: ../modules/addressbook/addressbook-config.c:208
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"ì ììì ìííë ìëìì SSLì ììíì ìëëë ìëìëë.  ìêì ìì"
-"íì ìì ìë ìê, ëììì ìíì ììí ì ììëë."
-
-#: ../modules/addressbook/addressbook-config.c:649
-msgid "U_se in Birthday & Anniversaries calendar"
-msgstr "ìì ë êëì ëëìì ìì(_S)"
-
-#: ../modules/addressbook/addressbook-config.c:693
-msgid "Copy _book content locally for offline operation"
-msgstr "ìê ìì ìí ììì ìí ììë ëì ëìì ëì(_B)"
-
-#: ../modules/addressbook/addressbook-config.c:812
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"ìëëììì ìêí LDAP ìëì íí ëíìëë. íì íí ëíì ëëì ì"
-"ê ììëë. ìë ííë ììíì í ìë ììí êëììê ëìëììì."
-
-#: ../modules/addressbook/addressbook-config.c:898
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"ìëëììì ììíë ëëìëë. \"ììëì ìì\"ë ììíë ëëì LDAP ì"
-"ëì ìë ìêì êëíì íëë."
-
-#: ../modules/addressbook/addressbook-config.c:987
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"êì ëìë ëëíë íë ìëë ìëë êì ìì ì ììíëë. \"ìë\"ì "
-"êì ëìë êì êì ìëì ëë ìíëì ëíì ìê ëëë. êì ëìê "
-"\"í ëê\"ìë êì êììì í ëê ìëì ìíëë íííëë."
-
-#: ../modules/addressbook/addressbook-config.c:1120
-msgid "Server Information"
-msgstr "ìë ìë"
-
-#: ../modules/addressbook/addressbook-config.c:1125
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "ììí"
-
-# ìí ìíê ìëë ìì ìì ìë, "~íë ì"ìë ëìíì ë ê
-#: ../modules/addressbook/addressbook-config.c:1126
-#: ../modules/mail/e-mail-shell-view.c:58
-msgid "Searching"
-msgstr "êì"
-
-# ìí ìíê ìëë ìì ìì ìë, "~íë ì"ìë ëìíì ë ê
-#: ../modules/addressbook/addressbook-config.c:1128
-msgid "Downloading"
-msgstr "ëìëë"
-
-#: ../modules/addressbook/addressbook-config.c:1346
-msgid "Address Book Properties"
-msgstr "ììë ìì"
-
-#: ../modules/addressbook/addressbook-config.c:1348
-msgid "New Address Book"
-msgstr "ì ììë"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "ìì URI ëëì ëí EFolderList XML"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "ìì URI ëëì ëí EFolderList XML."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
-msgstr "êììë ì \"ìëì\" ëìì, ìíí (ëë \"ìì\") ììëì UID."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
-msgid "Whether to show maps in preview pane."
-msgstr "ëë ëê ìì ìëë íìíì ìë."
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country."
-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:194
-#: ../modules/mail/em-mailer-prefs.c:1067
+#: ../modules/addressbook/autocompletion-config.c:96
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Table column:"
 msgstr "íìë ì(_T):"
 
 # free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
-#: ../modules/addressbook/autocompletion-config.c:197
+#: ../modules/addressbook/autocompletion-config.c:99
 msgid "Address formatting"
 msgstr "ìì íì"
 
-#: ../modules/addressbook/autocompletion-config.c:200
+#: ../modules/addressbook/autocompletion-config.c:102
 msgid "_Format address according to standard of its destination country"
 msgstr "ììë íëíë êêì íìì ëê íì ëìê(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:209
+#: ../modules/addressbook/autocompletion-config.c:111
 msgid "Autocompletion"
 msgstr "ìë ìì"
 
-#: ../modules/addressbook/autocompletion-config.c:212
+#: ../modules/addressbook/autocompletion-config.c:114
 msgid "Always _show address of the autocompleted contact"
 msgstr "íì ììëìì ìë ììí ëì ììë íì(_S)"
 
-#: ../modules/addressbook/eab-composer-util.c:149
+#: ../modules/addressbook/eab-composer-util.c:148
 msgid "Multiple vCards"
 msgstr "ìë ê vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:156
 #, c-format
 msgid "vCard for %s"
 msgstr "%sì ëí vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:169
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:168
+#: ../modules/addressbook/eab-composer-util.c:195
 #, c-format
 msgid "Contact information"
 msgstr "ìëì ìë"
 
-#: ../modules/addressbook/eab-composer-util.c:198
+#: ../modules/addressbook/eab-composer-util.c:197
 #, c-format
 msgid "Contact information for %s"
 msgstr "%sì ëí ìëì ìë"
 
-#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:108
-#: ../modules/addressbook/e-book-shell-migrate.c:154
-msgid "On LDAP Servers"
-msgstr "LDAP ìë"
+#: ../modules/addressbook/e-book-shell-backend.c:229
+#: ../modules/addressbook/e-book-shell-view-actions.c:131
+msgid "New Address Book"
+msgstr "ì ììë"
 
-#: ../modules/addressbook/e-book-shell-backend.c:309
+#: ../modules/addressbook/e-book-shell-backend.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "ìëì(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:311
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-backend.c:240
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
 msgid "Create a new contact"
 msgstr "ìëì ìëìë ëëëë"
 
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:245
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ìëì ëë(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:318
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-backend.c:247
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Create a new contact list"
 msgstr "ì ìëì ëëì ëëëë"
 
-#: ../modules/addressbook/e-book-shell-backend.c:326
+#: ../modules/addressbook/e-book-shell-backend.c:255
 msgctxt "New"
 msgid "Address _Book"
 msgstr "ììë(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:328
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-backend.c:257
+#: ../modules/addressbook/e-book-shell-view-actions.c:834
 msgid "Create a new address book"
 msgstr "ì ììëì ëëëë"
 
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:345
-#: ../modules/addressbook/e-book-shell-view.c:402
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:376
+#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../modules/addressbook/e-book-shell-view.c:356
 msgid "Contacts"
 msgstr "ìëì"
 
-#: ../modules/addressbook/e-book-shell-backend.c:356
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgid "Certificates"
 msgstr "ììì"
 
+#: ../modules/addressbook/e-book-shell-view-actions.c:204
+msgid "Address Book Properties"
+msgstr "ììë ìì"
+
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:391
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:386
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Save as vCard"
 msgstr "vCard íììë ìì"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
 msgid "Co_py All Contacts To..."
 msgstr "ëë ìëì ëì(_P)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:818
+#: ../modules/addressbook/e-book-shell-view-actions.c:813
 msgid "Copy the contacts of the selected address book to another"
 msgstr "ìíí ììëì ìëìë ëë ììëì ëìíëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:818
 msgid "D_elete Address Book"
 msgstr "ììë ìì(_E)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:820
 msgid "Delete the selected address book"
 msgstr "ìíí ììëì ììíëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:825
 msgid "Mo_ve All Contacts To..."
 msgstr "ëë ìëì ìë(_V)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
+#: ../modules/addressbook/e-book-shell-view-actions.c:827
 msgid "Move the contacts of the selected address book to another"
 msgstr "ìíí ììëì ìëìë ëë ììëìë ìêëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:837
+#: ../modules/addressbook/e-book-shell-view-actions.c:832
 msgid "_New Address Book"
 msgstr "ì ììë(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Address _Book Properties"
 msgstr "ììë ìì(_B)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
 msgid "Show properties of the selected address book"
 msgstr "ìíí ììëì ììì ëëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:851
+#: ../modules/addressbook/e-book-shell-view-actions.c:846
 msgid "Address Book _Map"
 msgstr "ììë ìë(_M)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
+#: ../modules/addressbook/e-book-shell-view-actions.c:848
 msgid "Show map with all contacts from selected address book"
 msgstr "ìíí ììëì ëë ìëìì ìëë íìíëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
-#: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/addressbook/e-book-shell-view-actions.c:853
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "_Rename..."
 msgstr "ìë ëêê(_R)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:855
 msgid "Rename the selected address book"
 msgstr "ìíí ììë ìëì ëêëë"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "Stop loading"
 msgstr "ììëìêë ììíëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
 msgid "_Copy Contact To..."
 msgstr "ìëì ëì(_C)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "Copy selected contacts to another address book"
 msgstr "ìíí ìëìë ëë ììëì ëìíëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 msgid "_Delete Contact"
 msgstr "ìëì ìì(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "_Find in Contact..."
 msgstr "ìëììì ìê(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:883
 msgid "Search for text in the displayed contact"
 msgstr "íìí ìëììì íìíë ììëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:893
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "_Forward Contact..."
 msgstr "ìëì ìë(_F)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:890
 msgid "Send selected contacts to another person"
 msgstr "ìíí ìëìë ëë ìëìê ëëëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:900
+#: ../modules/addressbook/e-book-shell-view-actions.c:895
 msgid "_Move Contact To..."
 msgstr "ìëì ìë(_M)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
 msgid "Move selected contacts to another address book"
 msgstr "ìíí ìëìë ëë ììëì ìêëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:907
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
 msgid "_New Contact..."
 msgstr "ì ìëì(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:914
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
 msgid "New Contact _List..."
 msgstr "ì ìëì ëë(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
 msgid "_Open Contact"
 msgstr "ìëì ìê(_O)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "View the current contact"
 msgstr "íì ìëìë ëëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:928
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "_Send Message to Contact..."
 msgstr "ìëìë ëìì ëëê(_S)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Send a message to the selected contacts"
 msgstr "ìíí ìëìë ëììë ëëëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
+#: ../modules/calendar/e-task-shell-view-actions.c:847
 msgid "_Actions"
 msgstr "ëì(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
+#: ../modules/calendar/e-memo-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:854
+#: ../modules/mail/e-mail-shell-view-actions.c:1475
 msgid "_Preview"
 msgstr "ëë ëê(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
-#: ../modules/calendar/e-memo-shell-view-actions.c:690
-#: ../modules/calendar/e-task-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/calendar/e-cal-shell-view-actions.c:1621
+#: ../modules/calendar/e-memo-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:867
 msgid "_Delete"
 msgstr "ìì(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "_Properties"
 msgstr "ìì(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:961
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Address Book Map"
 msgstr "ììë ìë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Contact _Preview"
 msgstr "ìëì ëë ëê(_P)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Show contact preview window"
 msgstr "ìëì ëë ëê ìì ëëë"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Show _Maps"
 msgstr "ìë íì(_M)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1003
+#: ../modules/addressbook/e-book-shell-view-actions.c:998
 msgid "Show maps in contact preview window"
 msgstr "ìëì ëë ëê ìì ìëë ëëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1548
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "_Classic View"
 msgstr "ìíììë ëê(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+#: ../modules/addressbook/e-book-shell-view-actions.c:1019
 msgid "Show contact preview below the contact list"
 msgstr "ìëì ëë ìëì ìëì ëë ëêë íìíëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1029
-#: ../modules/calendar/e-memo-shell-view-actions.c:754
-#: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
+#: ../modules/calendar/e-memo-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "_Vertical View"
 msgstr "ìëë ëê(_V)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
 msgid "Show contact preview alongside the contact list"
 msgstr "ìëì ëëê ëëí ìëì ëë ëêë íìíëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:960
 msgid "Any Category"
 msgstr "ëë ëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1046
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../modules/addressbook/e-book-shell-view-actions.c:1041
+#: ../modules/calendar/e-cal-shell-view-actions.c:1781
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Unmatched"
 msgstr "ëì ìì"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/calendar/e-cal-shell-view-actions.c:1791
+#: ../modules/calendar/e-memo-shell-view-actions.c:806
+#: ../modules/calendar/e-task-shell-view-actions.c:1005
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "êê êì"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1089
+#: ../modules/addressbook/e-book-shell-view-actions.c:1084
 msgid "Print all shown contacts"
 msgstr "íìë ëë ìëìë ììíëë"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1096
+#: ../modules/addressbook/e-book-shell-view-actions.c:1091
 msgid "Preview the contacts to be printed"
 msgstr "ììí ìëìë ëë ëëë"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../modules/addressbook/e-book-shell-view-actions.c:1098
 msgid "Print selected contacts"
 msgstr "ìíí ìëìë ììíëë"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1118
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "S_ave Address Book as vCard"
 msgstr "ììëì VCard íììë ìì(_A)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1120
+#: ../modules/addressbook/e-book-shell-view-actions.c:1115
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "ìíí ììëì ìëìë VCard íììë ììíëë"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1126
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
+#: ../modules/addressbook/e-book-shell-view-actions.c:1131
 msgid "_Save as vCard..."
 msgstr "vCardë ìì(_S)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:1128
+#: ../modules/addressbook/e-book-shell-view-actions.c:1123
 msgid "Save selected contacts as a vCard"
 msgstr "ìíí ìëìë VCard íììë ììíëë"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:300
 msgid "_Forward Contacts"
 msgstr "ìëì ìë(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:302
 msgid "_Forward Contact"
 msgstr "ìëì ìë(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:333
 msgid "_Send Message to Contacts"
 msgstr "ëììë ìëìì ëëê(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:381
+#: ../modules/addressbook/e-book-shell-view.c:335
 msgid "_Send Message to List"
 msgstr "ëììë ëëì ëëê(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:383
+#: ../modules/addressbook/e-book-shell-view.c:337
 msgid "_Send Message to Contact"
 msgstr "ëììë ìëìì ëëê(_S)"
 
@@ -15525,12 +14397,14 @@ msgid "Anonymously"
 msgstr "ìëìë"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "ììëì ìì ììíì"
 
 #: ../modules/addressbook/ldap-config.ui.h:6
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
-msgstr "êì ìë (DN) ìì"
+msgstr "êì ìë(DN) ìì"
 
 # LDAP ììí ë ìë ëëë êìíì ìí
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
@@ -15548,6 +14422,12 @@ msgstr "ìë ëê"
 msgid "Supported Search Bases"
 msgstr "ììíë êì êì"
 
+#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
+msgid "_Port:"
+msgstr "íí(_P):"
+
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Ser_ver:"
 msgstr "ìë(_V):"
@@ -15602,384 +14482,521 @@ msgstr "1"
 msgid "5"
 msgstr "5"
 
-#: ../modules/addressbook/ldap-config.ui.h:30
-msgid "contacts"
-msgstr "ìëì"
+#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
+msgid "contacts"
+msgstr "ìëì"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Timeout:"
+msgstr "ìíìê(_T):"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "_Download limit:"
+msgstr "ëìëë ìí(_D):"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:34
+msgid "B_rowse this book until limit reached"
+msgstr "íêìì ëëí ëêì ì ììë ëê(_R)"
+
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+msgid "Audio Player"
+msgstr "ìëì íëìì"
+
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:316
+msgid "Play the attachment in embedded audio player"
+msgstr "ìë íìì ëì ìëì íëìììì ìì"
+
+#: ../modules/backup-restore/e-mail-config-restore-page.c:167
+msgid ""
+"You can restore Evolution from a backup file.\n"
+"\n"
+"This will restore all your personal data, settings mail filters, etc."
+msgstr ""
+"ëììì ìëëìì ëêí ì ììëë.\n"
+"\n"
+"ëì, ëë, ìì, ëë, ìëì ëëë ëêí ì ììëë. ëë êì ìì, ëì íí êë ëë ëêíëë."
+
+#: ../modules/backup-restore/e-mail-config-restore-page.c:182
+msgid "_Restore from a backup file:"
+msgstr "ëì íììì ëê(_R):"
+
+#: ../modules/backup-restore/e-mail-config-restore-page.c:193
+msgid "Choose a backup file to restore"
+msgstr "ëêí ëì íìì ìííììì"
+
+#. Keep the title identical to EMailConfigRestorePage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/backup-restore/e-mail-config-restore-page.c:313
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+msgid "Restore from Backup"
+msgstr "ëììì ëê"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:217
+msgid "Select name of the Evolution backup file"
+msgstr "ìëëì ëì íì ìë ìí"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:250
+msgid "_Restart Evolution after backup"
+msgstr "ëìí ëìì ìëëì ëì ìì(_R)"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:277
+msgid "Select name of the Evolution backup file to restore"
+msgstr "ëêí ìëëì ëì íì ìë ìí"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:290
+msgid "_Restart Evolution after restore"
+msgstr "ëêí ëìì ìëëì ëì ìì(_R)"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:308
+msgid "_Back up Evolution Data..."
+msgstr "ìëëì ëìí ëì(_B)..."
+
+#: ../modules/backup-restore/evolution-backup-restore.c:310
+msgid "Back up Evolution data and settings to an archive file"
+msgstr "ìëëì ëìí ë ììì ìì íìì ëìíëë"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:315
+msgid "R_estore Evolution Data..."
+msgstr "ìëëì ëìí ëê(_E)..."
+
+#: ../modules/backup-restore/evolution-backup-restore.c:317
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "ìëëì ëìí ë ììì ìì íììì ëêíëë"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:83
+msgid "Back up Evolution directory"
+msgstr "ìëëì ëëíë ëì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:85
+msgid "Restore Evolution directory"
+msgstr "ìëëì ëëíë ëê"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:87
+msgid "Check Evolution Back up"
+msgstr "ìëëì ëì êì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:89
+msgid "Restart Evolution"
+msgstr "ìëëì ëì ìì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:91
+msgid "With Graphical User Interface"
+msgstr "êëí ììì ìííìì ìì"
+
+#. FIXME Will the versioned setting always work?
+#: ../modules/backup-restore/evolution-backup-tool.c:315
+#: ../modules/backup-restore/evolution-backup-tool.c:469
+msgid "Shutting down Evolution"
+msgstr "ìëëìì ìëíë ììëë"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:324
+msgid "Backing Evolution accounts and settings"
+msgstr "ìëëì êì ë ììì ëìíë ì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:341
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr "ìëëì ëìíë ëìíë ì(ëì, ìëì, ëë, ìì, ëë)"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:357
+msgid "Back up complete"
+msgstr "ëì ìë"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:364
+#: ../modules/backup-restore/evolution-backup-tool.c:654
+msgid "Restarting Evolution"
+msgstr "ìëëì ëì ììíë ì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:475
+msgid "Back up current Evolution data"
+msgstr "íì ìëëì ëìíë ëì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:483
+msgid "Extracting files from back up"
+msgstr "ëììì íìì ììíë ì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:570
+msgid "Loading Evolution settings"
+msgstr "ìëëì ììì ìììë ì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:624
+msgid "Removing temporary back up files"
+msgstr "ìì ëì íìì ììíë ì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:636
+msgid "Reloading registry service"
+msgstr "ëììíë ìëìë ëì ììëìë ì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:861
+msgid "Evolution Back Up"
+msgstr "ìëëì ëì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:862
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "%s íëì ëìíë ì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:866
+msgid "Evolution Restore"
+msgstr "ìëëì ëê"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:867
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "%s íëìì ëêíë ì"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:935
+msgid "Backing up Evolution Data"
+msgstr "ìëëì ëìíë ëìíë ììëë"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:936
+msgid "Please wait while Evolution is backing up your data."
+msgstr "ìëëììì ëìíë ëìíë ëì ìì êëëììì."
+
+#: ../modules/backup-restore/evolution-backup-tool.c:938
+msgid "Restoring Evolution Data"
+msgstr "ìëëì ëìíë ëêíë ììëë"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:939
+msgid "Please wait while Evolution is restoring your data."
+msgstr "ìëëììì ëìíë ëêíë ëì ìì êëëììì."
+
+#: ../modules/backup-restore/evolution-backup-tool.c:957
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "ì ììì êìì ëìí íêì ëë ìêì êë ìë ììëë."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Invalid Evolution backup file"
+msgstr "ìëëì ëì íìì ìëëììëë"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid "Please select a valid backup file to restore."
+msgstr "ëêí ìëë ëì íìì ìííììì."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Are you sure you want to close Evolution?"
+msgstr "ìëë ìëëìì ìëíìêìëê?"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"ëìíì ììì ëìíëë, ëì ìëëìì ëìììì. ììíì ìì ëìí"
+"ê ììë êì íìê ìì ëë ììíììì."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "ìëëìì ëê ëì"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "ìíí ëì íììì ìëë ìëëìì ëêíìêìëê?"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
+msgstr ""
+"ëìíì ììì ëêíëë, ëì ìëëìì ëìììì. ììíì ìì ëìí"
+"ê ììë êì íìê ìì ëë ììíììì. êì íìë íì ìëëì ëì"
+"íì ììì ììíê ëììì ëêíëë."
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Timeout:"
-msgstr "ìíìê(_T):"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "ìëëìì ëê ëê"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "_Download limit:"
-msgstr "ëìëë ìí(_D):"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "êíì ììëë"
 
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:34
-msgid "B_rowse this book until limit reached"
-msgstr "íêìì ëëí ëêì ì ììë ëê(_R)"
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "ìíí íëë ìê ìììëë."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
+#: ../modules/bogofilter/evolution-bogofilter.c:149
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "ëêííë ììíëë ìííìëë (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
+#: ../modules/bogofilter/evolution-bogofilter.c:167
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "ëì ëìì ëìì ëêííì ìëíëë ìííìëë: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
+#: ../modules/bogofilter/evolution-bogofilter.c:216
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "ëêííê ìì ìëíêë ëì ëììë ìëíëë ìííìëë"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:311
+#: ../modules/bogofilter/evolution-bogofilter.c:318
 msgid "Bogofilter Options"
 msgstr "ëêíí ìì"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:320
+#: ../modules/bogofilter/evolution-bogofilter.c:327
 msgid "Convert message text to _Unicode"
 msgstr "ëìì íìíë ìëìëë ëí(_U)"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:476
+#: ../modules/bogofilter/evolution-bogofilter.c:483
 msgid "Bogofilter"
 msgstr "ëêíí"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr "êììë ì \"ëë\" ëìì, ìíí (ëë \"ìì\") ëëì UID."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"ëëì ëìì ìêì ììí êë íì ìêë, Olsen íì ìêë ëìíëìì"
-"ì ëëì. (ëìíì ìê \"America/New York\"ì êì ìëë.)"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr ""
-"ìëëììì ìíí íì ìêëê ìëë ììí íì ìêëë ììíëë."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"ëì íì ìêëê ììë, ìë ëêìì ëì íì ìêëë íìíëë. êì "
-"'timezone' íìì ììí êê ëìíëë."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "List of recently used second time zones in a Day View."
-msgstr "ìë ëêìì ìêì ììí ëì íì ìêëì ëë."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Maximum number of recently used timezones to remember."
-msgstr "ìêì ììí íì ìêëë ììí ìë ì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+msgid "Standard LDAP Port"
+msgstr "íì LDAP íí"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
-"'day_second_zones' ëëìì ììí ìêì ììí íì ìêëì ìë ì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+msgid "LDAP over SSL (deprecated)"
+msgstr "LDAP, SSL ìì(ììíì ìêë êì)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "ìêì ìì/ìíê ìë 24ìê ëëë íìíì ìë."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+msgid "Microsoft Global Catalog"
+msgstr "ëìíëìíí êëë ìíëê"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "í ìê ììíë ìì, ììì(0)ìì íìì(6)."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+msgid "Microsoft Global Catalog over SSL"
+msgstr "ëìíëìíí êëë ìíëê, SSL ìì"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "êëìì ëëë ìê, 24ìê íììë 0ìì 23êì."
+# ìì: "-ì"ìë ëìíì ë ê
+#. Page 1
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+msgid "Connecting to LDAP"
+msgstr "LDAPì ìê"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "ìë ëê ë êëì ìë ëêì ëì ìê êê, ë ëì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+msgid "Server Information"
+msgstr "ìë ìë"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"êë ìì ìì, í ëì ëêê ìë ë ëì ìí ëëê ìì ëë ìì, íì "
-"ëì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+msgid "StartTLS (recommended)"
+msgstr "StartTLS(ìì)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Vertical pane position"
-msgstr "ìë ì ìì"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+msgid "Encryption:"
+msgstr "ìíí:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr ""
-"ìë ìì ìì, í ëì ëêê ìë ë ëì ëì ìí ëëê ìì ëë ìì, "
-"íì ëì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
+msgid "Authentication"
+msgstr "ìì"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"êë ìì ìì, í ëì ëêìì ëì ëì ìí ëëê ìì ëë ìì, íì "
-"ëì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+msgid "Anonymous"
+msgstr "ìë"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"ìë ìì ìì, í ëì ëêìì ëì ëì ìí ëëê ìì ëë ìì, íì "
-"ëì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+msgid "Method:"
+msgstr "ëì:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr "ìë ìì ìì, ìë ëëê ëì ììëê ëë ìì."
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Using email address\" requires anonymous access to your "
+"LDAP server."
+msgstr "ìëëììì ììíë ëëìëë. \"ììëì ìì ìì\"ìë ììíë ëëì LDAP ìëì ìë ìêì êëíì íëë."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"ëë ëê ìì ëë ëë ììì ëêíì ìëì ë ì êìíë ëì ëì. "
-"\"0\"ì (ìíì ëì) ëë ëê ìì ëë ëë ìëì ëëë. \"1\"ì (ìë "
-"ëê) ëë ëê ìì ëë ëë ìì ëëí ëëë."
+#. Page 2
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+msgid "Using LDAP"
+msgstr "LDAP ìì"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "ììë ëì ìì ëë ëë ëê ìì íìíëë."
+# ìí ìíê ìëë ìì ìì ìë, "~íë ì"ìë ëìíì ë ê
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/mail/e-mail-shell-view.c:116
+msgid "Searching"
+msgstr "êì"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr "êë ëíì ë ìì ëë ëê ìì ìì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+msgid "Search Base:"
+msgstr "êì êì:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "ìë ëíì ë ëë ëë ëê ìì ìì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+msgid "Find Possible Search Bases"
+msgstr "êëí êì êì ìê"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"ëë ëê ìì ìì ëë ììì ëêíì ìëì ë ì êìíë ëì ëì. "
-"\"0\"ì (ìíì ëì) ëë ëê ìì ìì ëë ìëì ëëë. \"1\"ì (ìë "
-"ëê) ëë ëê ìì ìì ëë ìì ëëí ëëë."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+msgid "One Level"
+msgstr "í ëê"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "ììë ëì ìì ìì ëë ëê ìì íìíëë."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+msgid "Subtree"
+msgstr "íì íë"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "ìë ëíì ë ìì ëë ëê ìì ìì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+msgid "Search Scope:"
+msgstr "êì ëì:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
 msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr "í ëì ë ë ìëì ììíì íìì/ìììì í ìì íìíì ìë."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Whether to display the end time of events in the week and month views."
-msgstr "í ìì ëêë í ëì ë ë íì ëëë ìê íìíì ìë."
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree.  A search scope of \"Subtree\" will include all entries "
+"below your search base.  A search scope of \"One Level\" will only include "
+"the entries one level beneath your search base."
+msgstr "êì ëìë ëëíë íë ìëë ìëë êì ìì ì ììíëë. \"íì íë\"ì êì ëìë êì êì ìëì ëë ìíëì ëíì ìê ëëë. êì ëìê \"í ëê\"ìë êì êììì í ëê ìëì ìíëë íííëë."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "êë ìì/ë ìêì ììí ë."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
+msgid "Search Filter:"
+msgstr "êì íí:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "ëëì ëìì ëìì ëìì (íë íì ìêëì ìì) êëì ìë."
+# ìí ìíê ìëë ìì ìì ìë, "~íë ì"ìë ëìíì ë ê
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+msgid "Downloading"
+msgstr "ëìëë"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "íëì ë ë ëìì ëìì ëìì êë ì."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+msgid "Limit:"
+msgstr "íêì:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "ìê ëëì ëìì ëìì ëìì êë ì (êëêì ëì ìì)."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+msgid "Browse until limit is reached"
+msgstr "íêìì ëëí ëêì ì ììë ëê"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show days with recurrent events in italic font in bottom left calendar."
-msgstr "ìì íëì ëëìì ëë íìê ìë ëì êììì êêë íìíëë."
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:130
+msgid "URL:"
+msgstr "URL:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view."
-msgstr "êììë ì \"ëë\" ëìì, ìíí (ëë \"ìì\") ëë ëëì UID."
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
+msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "IfMatch ííê(ìíì 2.2.8 ëë ëììì íì)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view."
-msgstr "êììë ì \"ìì\" ëìì, ìíí (ëë \"ìì\") ìì ëëì UID."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:417
+#, c-format
+msgid "HTTP Error: %s"
+msgstr "HTTP ìë: %s"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "ëëì ììì ìì íìí ë êìì ìë."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+msgid "Could not parse response"
+msgstr "ìëì ëìí ì ìì"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"ììì ìì ìêì êìíë ëì, \"minutes\", \"hours\" íì \"days\"."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:456
+msgid "Empty response"
+msgstr "ìë ëìê"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:86
-msgid "Number of units for determining when to hide tasks."
-msgstr "ìì ììì êì ì êìí ëìì ì."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:464
+msgid "Unexpected reply from server"
+msgstr "ìëìì ììì ëí ìë"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "ìë ëêì ììì ëêì, \"#rrggbb\" íì."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1051
+msgid "Could not locate user's calendars"
+msgstr "ììì ëëì ìì ì ìì"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "ëêì ìë ììì ëêì, \"#rrggbb\" íì."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1275
+msgid "Path"
+msgstr "êë"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "ìììë ììì ìì ë íì ìëì íì ìë."
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+msgid "Choose a Calendar"
+msgstr "ëë ìí"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "ìì ìììë ììì ëì ë íì ìëì íì ìë."
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+msgid "Choose a Memo List"
+msgstr "ëë ëë ìí"
 
-# Reminder -> ëë ìë, Microsoft Office XP
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Whether to set a default reminder for appointments."
-msgstr "ììì ëë ìë êëêì ììíì ìë."
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+msgid "Choose a Task List"
+msgstr "ìì ëë ìí"
 
-# Reminder -> ëë ìë, Microsoft Office XP
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
-msgid "Number of units for determining a default reminder."
-msgstr "êë ëë ìë ìëë êìí ëìì ì."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:269
+msgid "Find Calendars"
+msgstr "ëë ìê"
 
-# Reminder -> ëë ìë, Microsoft Office XP
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "êë ëë ìëì ëì, \"minutes\", \"hours\" íì \"days\"."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:272
+msgid "Find Memo Lists"
+msgstr "ëë ëë ìê"
 
-# Reminder -> ëë ìë, Microsoft Office XP
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "ëì ë êëì ëë ìë êëêì ììíì ìë."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:275
+msgid "Find Task Lists"
+msgstr "ìì ëë ìê"
 
-# Reminder -> ëë ìë, Microsoft Office XP
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr "ìì ë êëì ìëì êìí ëìì ì."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:293
+msgid "Path:"
+msgstr "êë:"
 
-# Reminder -> ëë ìë, Microsoft Office XP
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr "ëì ë êëì ëë ìëì ëì: \"minutes\", \"hours\" ëë \"days\"."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+msgid "Email:"
+msgstr "ììëì:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "ëëì ìëêì ëëìì ë ëì ììì íìíì ìë."
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:304
+msgid "Server handles meeting invitations"
+msgstr "ìëìì ëì ìëë ìë"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-msgid "Scroll Month View by a week"
-msgstr "í ì ëìë ëë ëêë ìíë"
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
+msgid "Choose which address books to use."
+msgstr "ìë ììëì ììíì ìííììì."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr "í ë ëìê ìëë í ì ëìë ëë ëêë ìíëíì ìë."
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+msgid "Use in Birthdays & Anniversaries calendar"
+msgstr "ìì ë êëì ëëìì ìì"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
-msgid "Time the last reminder ran, in time_t."
-msgstr "ìêì ëë ìëì ìëí ìê, time_t."
+#: ../modules/cal-config-google/e-google-chooser-button.c:127
+msgid "Default User Calendar"
+msgstr "êë ììì ëë"
 
-# Reminder -> ëë ìë, Microsoft Office XP
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Calendars to run reminders for"
-msgstr "ëë ìëì ìíí ëë"
+#: ../modules/cal-config-google/e-google-chooser.c:508
+#, c-format
+msgid "Enter Google password for user '%s'."
+msgstr "'%s' ìììì êê ìíë ìëíììì."
 
-# Reminder -> ëë ìë, Microsoft Office XP
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Programs that are allowed to be run by reminders."
-msgstr "ëë ìëìì ìíí íëêë."
+#: ../modules/cal-config-google/e-google-chooser.c:525
+msgid "User declined to provide a password"
+msgstr "ìììê ìí ìëì êëíìëë"
 
-# Reminder -> ëë ìë, Microsoft Office XP
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether or not to use the notification tray for display reminders."
-msgstr "ëë ìëì íìí ë ìë ììì ììíì ìë."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:161
+msgid "Use an existing iCalendar (ics) file"
+msgstr "íì iìëë íì(ics) ìì"
 
-# free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Free/busy server URLs"
-msgstr "ìì ìì/ìì ìë URL"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:186
+msgid "iCalendar File"
+msgstr "iìëë íì"
 
-# free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid "List of server URLs for free/busy publishing."
-msgstr "ìì ìì/ìì ìëë êìí ìë URL ëë."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+msgid "Choose an iCalendar file"
+msgstr "iìëë íìì ìííììì"
 
-# free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"ìì ìì/ìì ëìí ëìíìë ììí URL ìì, %uì(ë) ììëì ììì ì"
-"ìì ëë, %dì(ë) ëëììë ëëëë."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:201
+msgid "File:"
+msgstr "íì:"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"ì êì êì êëíëë. \"0\"ì ìë, \"1\"ì êê, \"2\"ë ëëê ëìì."
+#: ../modules/cal-config-local/evolution-cal-config-local.c:216
+msgid "Allow Evolution to update the file"
+msgstr "ìëëììì íì ìëìí íì"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:316
+#: ../modules/calendar/e-cal-attachment-handler.c:323
 #: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "êììê(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:397
+#: ../modules/calendar/e-cal-attachment-handler.c:409
 msgid "Select a Calendar"
 msgstr "ëë ìí"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:424
+#: ../modules/calendar/e-cal-attachment-handler.c:436
 msgid "Select a Task List"
 msgstr "ìì ëë ìí"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:434
+#: ../modules/calendar/e-cal-attachment-handler.c:446
 msgid "I_mport to Calendar"
 msgstr "ëëìë êììê(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:453
 msgid "I_mport to Tasks"
 msgstr "ìììë êììê(_M)"
 
-# Reminder -> ëë ìë, Microsoft Office XP
-#: ../modules/calendar/e-calendar-preferences.c:467
-msgid "Selected Calendars for Reminders"
-msgstr "ëë ìëì ìíí ëë"
+#: ../modules/calendar/e-calendar-preferences.c:407
+msgid "Selected Calendars for Alarms"
+msgstr "ìë ìëë ìíí ëë"
 
-#: ../modules/calendar/e-calendar-preferences.c:891
+#: ../modules/calendar/e-calendar-preferences.c:829
 msgid "Ti_me and date:"
 msgstr "ëì ë ìê(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:892
+#: ../modules/calendar/e-calendar-preferences.c:830
 msgid "_Date only:"
 msgstr "ëìë(_D):"
 
@@ -16041,14 +15058,14 @@ msgstr "ìê íì:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:23
 msgid "_12 hour (AM/PM)"
-msgstr "_12ìê (ìì/ìí)"
+msgstr "_12ìê(ìì/ìí)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_24 hour"
 msgstr "_24ìê"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Work Week"
 msgstr "êë ì"
 
@@ -16141,6 +15158,10 @@ msgstr "í ì ëìë ëë ëêë ìíë(_R)"
 msgid "Display"
 msgstr "íì"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "Task List"
+msgstr "ìì ëë"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Highlight t_asks due today"
 msgstr "ìë ëêì ìì êì(_A)"
@@ -16206,94 +15227,73 @@ msgstr "%u ë %d êíë ììëì ììì ìììì ëëììë
 msgid "Publishing Information"
 msgstr "êì ìë"
 
-#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:114
-#: ../modules/calendar/e-memo-shell-migrate.c:155
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:164
-msgid "On The Web"
-msgstr "ì"
-
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../plugins/calendar-weather/calendar-weather.c:127
-msgid "Weather"
-msgstr "ëì"
-
-#: ../modules/calendar/e-cal-shell-backend.c:212
-#: ../modules/calendar/e-cal-shell-migrate.c:66
-msgid "Birthdays & Anniversaries"
-msgstr "ìì ë êëì"
-
-#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-backend.c:278
+#: ../modules/calendar/e-cal-shell-view-actions.c:192
+msgid "New Calendar"
+msgstr "ì ëë"
+
+#: ../modules/calendar/e-cal-shell-backend.c:287
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ìì(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-backend.c:289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1548
 msgid "Create a new appointment"
 msgstr "ì ììì ëëëë"
 
-#: ../modules/calendar/e-cal-shell-backend.c:458
+#: ../modules/calendar/e-cal-shell-backend.c:294
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "íë ìì ìì(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:296
 msgid "Create a new all-day appointment"
 msgstr "ì íë ìì ììì ëëëë"
 
-#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-backend.c:301
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ëì(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:467
+#: ../modules/calendar/e-cal-shell-backend.c:303
 msgid "Create a new meeting request"
 msgstr "ì ëì ììì ëëëë"
 
-#: ../modules/calendar/e-cal-shell-backend.c:475
+#: ../modules/calendar/e-cal-shell-backend.c:311
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ëë(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:477
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "Create a new calendar"
 msgstr "ì ëëì ëëëë"
 
-#: ../modules/calendar/e-cal-shell-backend.c:800
+#: ../modules/calendar/e-cal-shell-backend.c:597
 msgid "Calendar and Tasks"
 msgstr "ëë ë ìì"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:190
+#: ../modules/calendar/e-cal-shell-sidebar.c:211
 msgid "Loading calendars"
 msgstr "ëë ììëìë ì"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-msgid "_New Calendar..."
-msgstr "ì ëë(_N)..."
-
 # a11y
-#: ../modules/calendar/e-cal-shell-sidebar.c:778
+#: ../modules/calendar/e-cal-shell-sidebar.c:731
 msgid "Calendar Selector"
 msgstr "ëë ìí"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1114
+#: ../modules/calendar/e-cal-shell-sidebar.c:1090
 #, c-format
-msgid "Opening calendar at %s"
-msgstr "%s ìììì ëëì ìë ì"
+msgid "Opening calendar '%s'"
+msgstr "'%s' ëëì ìë ì"
 
-#: ../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:292
+msgid "Calendar Properties"
+msgstr "ëë ìì"
 
 # event -> íì, Microsoft Office XP ìê
-#: ../modules/calendar/e-cal-shell-view-actions.c:320
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
 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 "
@@ -16306,553 +15306,617 @@ msgstr ""
 # event -> íì, Microsoft Office XP ìê
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:337
+#: ../modules/calendar/e-cal-shell-view-actions.c:340
 msgid "Purge events older than"
 msgstr "ëìëë ìëë íì ììê:"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:564
+#: ../modules/calendar/e-cal-shell-view-actions.c:591
 msgid "Copying Items"
 msgstr "íëì ëìíë ì"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:848
+#: ../modules/calendar/e-cal-shell-view-actions.c:885
 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:1175
+#: ../modules/calendar/e-cal-shell-view-actions.c:1218
 msgid "event"
 msgstr "íì"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1177
-#: ../modules/calendar/e-cal-shell-view-memopad.c:219
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../modules/calendar/e-cal-shell-view-memopad.c:231
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:549
+#: ../modules/calendar/e-task-shell-view-actions.c:666
 msgid "Save as iCalendar"
 msgstr "iCalendar íììë ìì"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-memo-shell-view-actions.c:630
 msgid "_Copy..."
 msgstr "ëì(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "D_elete Calendar"
 msgstr "ëë ìì(_E)"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Delete the selected calendar"
 msgstr "ìíí ëëì ììíëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Go Back"
 msgstr "ëë ìë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Go Forward"
 msgstr "ììë ìë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Select today"
 msgstr "ìë ìí"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "Select _Date"
 msgstr "ëì ìí(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "Select a specific date"
 msgstr "ììí ëì ìí"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "_New Calendar"
 msgstr "ì ëë(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Purg_e"
 msgstr "ììí ììê(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Purge old appointments and meetings"
 msgstr "ìëê ììê ëìì ììí ììëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "Re_fresh"
 msgstr "ìë êì(_F)"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Refresh the selected calendar"
 msgstr "ìíí ëëì ìë êìëë"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "Rename the selected calendar"
 msgstr "ìíí ëë ìëì ëêëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+msgid "Find _next"
+msgstr "ëì ìê(_N)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+msgid "Find next occurrence of the current search string"
+msgstr "íì êì ëììì ëì íë ëêë ììëë"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+msgid "Find _previous"
+msgstr "ìì ìê(_P)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1464
+msgid "Find previous occurrence of the current search string"
+msgstr "íì êì ëììì ìì íë ëêë ììëë"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+msgid "Stop _running search"
+msgstr "êì ìí ìì(_R)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+msgid "Stop currently running search"
+msgstr "íì ìí ìì êìì ììíëë"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1476
 msgid "Show _Only This Calendar"
 msgstr "ì ëëë íì(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Cop_y to Calendar..."
 msgstr "ëëìë ëì(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1490
 msgid "_Delegate Meeting..."
 msgstr "ëì ëë(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
 msgid "_Delete Appointment"
 msgstr "ìì ìì(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1499
 msgid "Delete selected appointments"
 msgstr "ìíí ììì ììíëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1504
 msgid "Delete This _Occurrence"
 msgstr "ì êì ìì(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "Delete this occurrence"
 msgstr "ì êìë ììíëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
 msgid "Delete All Occ_urrences"
 msgstr "ëë êì ìì(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
 msgid "Delete all occurrences"
 msgstr "ëë êìë ììíëë"
 
 # event -> íì, Microsoft Office XP ìê
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "New All Day _Event..."
 msgstr "ì íë ìì íì(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 msgid "Create a new all day event"
 msgstr "ì íë ìì ììì ëëëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "_Forward as iCalendar..."
 msgstr "iCalendarë ìë(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
 msgid "New _Meeting..."
 msgstr "ì ëì(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 msgid "Create a new meeting"
 msgstr "ì ëìì ëëëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
 msgid "Mo_ve to Calendar..."
 msgstr "ëëìë ìë(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1546
 msgid "New _Appointment..."
 msgstr "ì ìì(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../modules/calendar/e-cal-shell-view-actions.c:1553
 msgid "Make this Occurrence _Movable"
 msgstr "ì êì ìê ì ìê ëëê(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1560
 msgid "_Open Appointment"
 msgstr "ìì ìê(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 msgid "View the current appointment"
 msgstr "íì ììì ëëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1567
 msgid "_Reply"
 msgstr "íì(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "_Schedule Meeting..."
 msgstr "ëì ìíê(_S)..."
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Converts an appointment to a meeting"
 msgstr "ììì ëììë ëííëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Conv_ert to Appointment..."
 msgstr "ìììë ëí(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Converts a meeting to an appointment"
 msgstr "ëìì ìììë ëííëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Quit"
 msgstr "ëëê"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1715
 msgid "Day"
 msgstr "íë"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Show one day"
 msgstr "íëì ëëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1722
 msgid "List"
 msgstr "ëë"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-cal-shell-view-actions.c:1724
 msgid "Show as list"
 msgstr "ëëìë ëëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-cal-shell-view-actions.c:1729
 msgid "Month"
 msgstr "í ë"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1731
 msgid "Show one month"
 msgstr "í ëì ëëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-cal-shell-view-actions.c:1736
 msgid "Week"
 msgstr "í ìì"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
 msgid "Show one week"
 msgstr "í ìì ëëë"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1745
 msgid "Show one work week"
 msgstr "í ìì êëì êììë ëëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Active Appointments"
 msgstr "íìíí ìì"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Next 7 Days' Appointments"
 msgstr "ììë 7ì êì ìì"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1774
 msgid "Occurs Less Than 5 Times"
 msgstr "5ë ëë íë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1805
+#: ../modules/calendar/e-memo-shell-view-actions.c:820
+#: ../modules/calendar/e-task-shell-view-actions.c:1019
 msgid "Description contains"
 msgstr "ìëì íí"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1748
-#: ../modules/calendar/e-memo-shell-view-actions.c:802
-#: ../modules/calendar/e-task-shell-view-actions.c:1001
+#: ../modules/calendar/e-cal-shell-view-actions.c:1812
+#: ../modules/calendar/e-memo-shell-view-actions.c:827
+#: ../modules/calendar/e-task-shell-view-actions.c:1026
 msgid "Summary contains"
 msgstr "ììì íí"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1824
 msgid "Print this calendar"
 msgstr "ì ëëì ììíëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1831
 msgid "Preview the calendar to be printed"
 msgstr "ììí ëëì ëë ëëë"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1789
-#: ../modules/calendar/e-cal-shell-view-memopad.c:294
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
-#: ../modules/calendar/e-memo-shell-view-actions.c:843
-#: ../modules/calendar/e-task-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1853
+#: ../modules/calendar/e-cal-shell-view-memopad.c:306
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
+#: ../modules/calendar/e-memo-shell-view-actions.c:868
+#: ../modules/calendar/e-task-shell-view-actions.c:1067
 msgid "_Save as iCalendar..."
 msgstr "iCalendarë ìì(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1930
 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:217
-#: ../modules/calendar/e-memo-shell-view-actions.c:522
+#: ../modules/calendar/e-cal-shell-view-memopad.c:229
+#: ../modules/calendar/e-memo-shell-view-actions.c:547
 msgid "memo"
 msgstr "ëë"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-memo-shell-view-actions.c:679
 msgid "New _Memo"
 msgstr "ì ëë(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-memo-shell-backend.c:310
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-memo-shell-backend.c:204
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
 msgid "Create a new memo"
 msgstr "ì ëëë ëëëë"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:267
-#: ../modules/calendar/e-memo-shell-view-actions.c:661
+#: ../modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:686
 msgid "_Open Memo"
 msgstr "ëë ìê(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:269
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:688
 msgid "View the selected memo"
 msgstr "ìíí ëëë ëëë"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:831
 msgid "Open _Web Page"
 msgstr "ì íìì ìê(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-cal-shell-view-memopad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:853
 msgid "Print the selected memo"
 msgstr "ìíí ëëë ììíëë"
 
+#: ../modules/calendar/e-cal-shell-view-private.c:1477
+msgid "Searching next matching event"
+msgstr "ììíë ëì ìëí ìë ì"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1478
+msgid "Searching previous matching event"
+msgstr "ììíë ìì ìëí ìë ì"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1499
+#, c-format
+msgid "Cannot find matching event in the next %d year"
+msgid_plural "Cannot find matching event in the next %d years"
+msgstr[0] "ëì %dë ìì ììíë ìëíë ìì ëíìëë"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1503
+#, c-format
+msgid "Cannot find matching event in the previous %d year"
+msgid_plural "Cannot find matching event in the previous %d years"
+msgstr[0] "ìì %dë ìì ììíë ìëíë ìì ëíìëë"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1528
+msgid "Cannot search with no active calendar"
+msgstr "íìíí ëëì ììë êìí ì ììëë"
+
 #. Translators: Default filename part saving a task to a file when
 #. * 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:284
-#: ../modules/calendar/e-task-shell-view-actions.c:639
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
+#: ../modules/calendar/e-task-shell-view-actions.c:664
 msgid "task"
 msgstr "ìì"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_Assign Task"
 msgstr "ìì íë(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "_Mark as Complete"
 msgstr "ìì ìë íì(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Mark selected tasks as complete"
 msgstr "ìíí ììì ëì êìë íìíëë"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 msgid "_Mark as Incomplete"
 msgstr "ìì ëìë íì(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "Mark selected tasks as incomplete"
 msgstr "ìíí ììì ëìëë íìíëë"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:817
 msgid "New _Task"
 msgstr "ì ìì(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-backend.c:305
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-task-shell-backend.c:201
+#: ../modules/calendar/e-task-shell-view-actions.c:819
 msgid "Create a new task"
 msgstr "ì ììì ëëëë"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
+#: ../modules/calendar/e-task-shell-view-actions.c:824
 msgid "_Open Task"
 msgstr "ìì ìê(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
+#: ../modules/calendar/e-task-shell-view-actions.c:826
 msgid "View the selected task"
 msgstr "ìíí ììì ëëë"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
+#: ../modules/calendar/e-task-shell-view-actions.c:1052
 msgid "Print the selected task"
 msgstr "ìíí ììì ììíëë"
 
-#: ../modules/calendar/e-memo-shell-backend.c:308
+#: ../modules/calendar/e-memo-shell-backend.c:193
+#: ../modules/calendar/e-memo-shell-view-actions.c:217
+msgid "New Memo List"
+msgstr "ì ëë ëë"
+
+#: ../modules/calendar/e-memo-shell-backend.c:202
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ëë(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:315
+#: ../modules/calendar/e-memo-shell-backend.c:209
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "êì ëë(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-backend.c:211
 msgid "Create a new shared memo"
 msgstr "ì êì ëëë ëëëë"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:219
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ëë ëë(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-backend.c:221
+#: ../modules/calendar/e-memo-shell-view-actions.c:646
 msgid "Create a new memo list"
 msgstr "ì ëë ëëì ëëëë"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:186
+#: ../modules/calendar/e-memo-shell-sidebar.c:206
 msgid "Loading memos"
 msgstr "ëëë ììëìë ììëë"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:703
+#: ../modules/calendar/e-memo-shell-sidebar.c:663
 msgid "Memo List Selector"
 msgstr "ëë ëë ìí"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:1001
+#: ../modules/calendar/e-memo-shell-sidebar.c:975
 #, c-format
-msgid "Opening memos at %s"
-msgstr "%sì ìë ëëë ìë ììëë"
+msgid "Opening memo list '%s'"
+msgstr "'%s' ëë ëëì ìë ì"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:231
-#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:248
 msgid "Print Memos"
 msgstr "ëë ìì"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:289
+msgid "Memo List Properties"
+msgstr "ëë ëë ìì"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:609
 msgid "_Delete Memo"
 msgstr "ëë ìì(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "_Find in Memo..."
 msgstr "ëëìì ìê(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:618
 msgid "Search for text in the displayed memo"
 msgstr "íìí ëëìì íìíë ììëë"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "D_elete Memo List"
 msgstr "ëë ëë ìì(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:639
 msgid "Delete the selected memo list"
 msgstr "ìíí ëë ëëì ììíëë"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "_New Memo List"
 msgstr "ì ëë ëë(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
 msgid "Refresh the selected memo list"
 msgstr "ìíí ëë ëëì ìë êìëë"
 
 # tooltip
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-memo-shell-view-actions.c:667
 msgid "Rename the selected memo list"
 msgstr "ìíí ëë ëëì ìëì ëêëë"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-view-actions.c:672
 msgid "Show _Only This Memo List"
 msgstr "ì ëë ëëë íì(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
 msgid "Memo _Preview"
 msgstr "ëë ëë ëê(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:753
 msgid "Show memo preview pane"
 msgstr "ëë ëë ëê ì ëê"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
 msgid "Show memo preview below the memo list"
 msgstr "ëë ëë ìëì ëë ëë ëêë íìíëë"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
 msgid "Show memo preview alongside the memo list"
 msgstr "ëë ëëê ëëí ëë ëë ëêë íìíëë"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:839
 msgid "Print the list of memos"
 msgstr "ëë ëë ìì"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-memo-shell-view-actions.c:846
 msgid "Preview the list of memos to be printed"
 msgstr "ììí ëë ëëì ëë ëëë"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
+#: ../modules/calendar/e-memo-shell-view.c:236
 msgid "Delete Memos"
 msgstr "ëë ìì"
 
-#: ../modules/calendar/e-memo-shell-view.c:229
+#: ../modules/calendar/e-memo-shell-view.c:238
 msgid "Delete Memo"
 msgstr "ëë ìì"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-memo-shell-view-private.c:428
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%dê ëë"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:609
+#: ../modules/calendar/e-memo-shell-view-private.c:432
+#: ../modules/calendar/e-task-shell-view-private.c:613
 #, c-format
 msgid "%d selected"
 msgstr "%dê ìí"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-backend.c:190
+#: ../modules/calendar/e-task-shell-view-actions.c:240
+msgid "New Task List"
+msgstr "ì ìì ëë"
+
+#: ../modules/calendar/e-task-shell-backend.c:199
 msgctxt "New"
 msgid "_Task"
 msgstr "ìì(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:310
+#: ../modules/calendar/e-task-shell-backend.c:206
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "íëí ìì(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:312
+#: ../modules/calendar/e-task-shell-backend.c:208
 msgid "Create a new assigned task"
 msgstr "ìë íëí ììì ëëëë"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-task-shell-backend.c:216
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "ìì ëë(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-backend.c:218
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Create a new task list"
 msgstr "ì ìì ëëì ëëëë"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:186
+#: ../modules/calendar/e-task-shell-sidebar.c:206
 msgid "Loading tasks"
 msgstr "ììì ììëìë ììëë"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:703
+#: ../modules/calendar/e-task-shell-sidebar.c:663
 msgid "Task List Selector"
 msgstr "ìì ëë ìí"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:1002
+#: ../modules/calendar/e-task-shell-sidebar.c:975
 #, c-format
-msgid "Opening tasks at %s"
-msgstr "%sì ìë ììì ìë ììëë"
+msgid "Opening task list '%s'"
+msgstr "'%s' ìì ëëì ìë ì"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:254
-#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:271
 msgid "Print Tasks"
 msgstr "ìì ìì"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:583
+#: ../modules/calendar/e-task-shell-view-actions.c:312
+msgid "Task List Properties"
+msgstr "ìì ëë ìì"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:608
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -16865,2469 +15929,2324 @@ msgstr ""
 "ìëë ì ììëì ìììêìëê?"
 
 # ìì: check buttonì ìì. ëììë ëìíì ë ê
-#: ../modules/calendar/e-task-shell-view-actions.c:590
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 msgid "Do not ask me again"
 msgstr "ëì ëì ìê"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "_Delete Task"
 msgstr "ìì ìì(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "_Find in Task..."
 msgstr "ìììì ìê(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Search for text in the displayed task"
 msgstr "íìí ìììì íìíë ììëë"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:754
 msgid "Copy..."
 msgstr "ëì..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "D_elete Task List"
 msgstr "ìì ëë ìì(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "Delete the selected task list"
 msgstr "ìíí ìì ëëì ììíëë"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_New Task List"
 msgstr "ì ìì ëë(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Refresh the selected task list"
 msgstr "ìíí ìì ëëì ìë êìëë"
 
 # tooltip
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "Rename the selected task list"
 msgstr "ìíí ìì ëë ìëì ëêëë"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Show _Only This Task List"
 msgstr "ì ìì ëëë íì(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:810
 msgid "Mar_k as Incomplete"
 msgstr "ìì ëìë íì(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:840
 msgid "Delete completed tasks"
 msgstr "ëëì ììì ììíëë"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Task _Preview"
 msgstr "ìì ëë ëê(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:917
 msgid "Show task preview pane"
 msgstr "ìì ëë ëê ì ëê"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/calendar/e-task-shell-view-actions.c:938
 msgid "Show task preview below the task list"
 msgstr "ìì ëë ìëì ìì ëë ëêë íìíëë"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 msgid "Show task preview alongside the task list"
 msgstr "ìì ëëê ëëí ìì ëë ëêë íìíëë"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:953
 msgid "Active Tasks"
 msgstr "íìíí ìì"
 
-# FIXME - hard to translate UI + string based on English grammar
-#: ../modules/calendar/e-task-shell-view-actions.c:942
-msgid "Completed Tasks"
-msgstr "ìëí ìì"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:949
-msgid "Next 7 Days' Tasks"
-msgstr "ììë 7ì êì ìì"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:956
-msgid "Overdue Tasks"
-msgstr "ëêì ìë ìì"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:963
-msgid "Tasks with Attachments"
-msgstr "ìëê ìë ìì"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
-msgid "Print the list of tasks"
-msgstr "ìì ëë ìì"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
-msgid "Preview the list of tasks to be printed"
-msgstr "ììí ìì ëëì ëë ëëë"
-
-#: ../modules/calendar/e-task-shell-view.c:362
-msgid "Delete Tasks"
-msgstr "ìì ìì"
-
-#: ../modules/calendar/e-task-shell-view.c:364
-msgid "Delete Task"
-msgstr "ìì ìì"
-
-#: ../modules/calendar/e-task-shell-view-private.c:498
-msgid "Expunging"
-msgstr "ìì ëìì ëìë ì"
-
-#: ../modules/calendar/e-task-shell-view-private.c:605
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "ìëì %dê"
-
-#: ../modules/mail/e-mail-attachment-handler.c:389
-#, c-format
-msgid "%d attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "ìëí ëìì %dê"
-
-#: ../modules/mail/e-mail-shell-backend.c:230
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "ëì ëìì(_M)"
-
-#: ../modules/mail/e-mail-shell-backend.c:232
-msgid "Compose a new mail message"
-msgstr "ëì ëììë ìë ììíëë"
-
-#: ../modules/mail/e-mail-shell-backend.c:240
-msgctxt "New"
-msgid "Mail Acco_unt"
-msgstr "ëì êì(_U)"
-
-#: ../modules/mail/e-mail-shell-backend.c:242
-msgid "Create a new mail account"
-msgstr "ì ëì êìì ëëëë"
-
-#: ../modules/mail/e-mail-shell-backend.c:247
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "ëì íë(_F)"
-
-#: ../modules/mail/e-mail-shell-backend.c:249
-msgid "Create a new mail folder"
-msgstr "ì ëì íëë ëëëë"
-
-#: ../modules/mail/e-mail-shell-backend.c:464
-msgid "Mail Accounts"
-msgstr "ëì êì"
-
-#: ../modules/mail/e-mail-shell-backend.c:473
-msgid "Mail Preferences"
-msgstr "ëì êë ìì"
-
-#: ../modules/mail/e-mail-shell-backend.c:482
-msgid "Composer Preferences"
-msgstr "ëì ìì êë ìì"
-
-#: ../modules/mail/e-mail-shell-backend.c:491
-msgid "Network Preferences"
-msgstr "ëíìí êë ìì"
-
-#: ../modules/mail/e-mail-shell-backend.c:725
-msgid "Evolution Account Assistant"
-msgstr "ìëëì êì ëìë"
-
-#: ../modules/mail/e-mail-shell-backend.c:771
-msgid "Account Editor"
-msgstr "êì íìê"
+# FIXME - hard to translate UI + string based on English grammar
+#: ../modules/calendar/e-task-shell-view-actions.c:967
+msgid "Completed Tasks"
+msgstr "ìëí ìì"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
-#: ../modules/mail/e-mail-shell-view.c:947
-msgid "_Disable Account"
-msgstr "êì ìì ìê(_D)"
+#: ../modules/calendar/e-task-shell-view-actions.c:974
+msgid "Next 7 Days' Tasks"
+msgstr "ììë 7ì êì ìì"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
-msgid "Disable this account"
-msgstr "ì êìì ììíì ììëë"
+#: ../modules/calendar/e-task-shell-view-actions.c:981
+msgid "Overdue Tasks"
+msgstr "ëêì ìë ìì"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
-msgid "Permanently remove all the deleted messages from all folders"
-msgstr "ëë íëì ììí ëììë ììí ìêíëë"
+#: ../modules/calendar/e-task-shell-view-actions.c:988
+msgid "Tasks with Attachments"
+msgstr "ìëê ìë ìì"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
-msgid "Edit properties of this account"
-msgstr "ì êìì ììì íìíëë"
+#: ../modules/calendar/e-task-shell-view-actions.c:1038
+msgid "Print the list of tasks"
+msgstr "ìì ëë ìì"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
-msgid "_Download Messages for Offline Usage"
-msgstr "ìê ìì ìí ìëë ëìì ëìëë(_D)"
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
+msgid "Preview the list of tasks to be printed"
+msgstr "ììí ìì ëëì ëë ëëë"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
-msgid "Download messages of accounts and folders marked for offline usage"
-msgstr "ìê ìì ìí ìììë íìí êì ë íëì ëììë ëìëëíëë"
+#: ../modules/calendar/e-task-shell-view.c:371
+msgid "Delete Tasks"
+msgstr "ìì ìì"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
-msgid "Fl_ush Outbox"
-msgstr "ëë íìí íëì(_U)"
+#: ../modules/calendar/e-task-shell-view.c:373
+msgid "Delete Task"
+msgstr "ìì ìì"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
-msgid "_Copy Folder To..."
-msgstr "íë ëì(_C)..."
+#: ../modules/calendar/e-task-shell-view-private.c:502
+msgid "Expunging"
+msgstr "ìì ëìì ëìë ì"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
-msgid "Copy the selected folder into another folder"
-msgstr "ìíí íëë ëë íëë ëìíëë"
+#: ../modules/calendar/e-task-shell-view-private.c:609
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "ìëì %dê"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
-msgid "Permanently remove this folder"
-msgstr "ì íëë ììí ìêíëë"
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:225
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:395
+msgid "IMAP Headers"
+msgstr "IMAP íë"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
-msgid "E_xpunge"
-msgstr "ììí ìì(_X)"
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:233
+msgid ""
+"Select a predefined set of IMAP headers to fetch.\n"
+"Note, larger sets of headers take longer to download."
+msgstr ""
+"êìì IMAP íëì ìíì ëë ìííììì.\n"
+"ë ëì ìëì íëë ìííë ëìëëíëë ìë êëë ììíììì."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "ì íëì ììí ëë ëììë ììí ìêíëë"
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
+msgid "_Fetch All Headers"
+msgstr "íë ëë êììê(_F)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
-msgid "Mar_k All Messages as Read"
-msgstr "ëë ëììë ìì êìë íì(_K)"
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
+msgid "_Basic Headers (fastest)"
+msgstr "êë íë(êì ëë)(_B)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
-msgid "Mark all messages in the folder as read"
-msgstr "íëì ëë ëììë ìì êìë íìíëë"
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:271
+msgid "Use this if you are not filtering any mailing lists."
+msgstr "ëìë ëìí êë ííê ììë ì ììì ììíììì."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
-msgid "_Move Folder To..."
-msgstr "íë ìêê(_M)..."
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:281
+msgid "Basic and _Mailing List Headers (default)"
+msgstr "êë ë ëìë ëìí íë(êëê)(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
-msgid "Move the selected folder into another folder"
-msgstr "ìíí íëë ëë íëë ìêëë"
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
+msgid "Custom Headers"
+msgstr "ììì ìì íë"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1250
-msgid "_New..."
-msgstr "ìë ëëê(_N)..."
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:338
+msgid ""
+"Specify any extra headers to fetch in addition to the predefined set of "
+"headers selected above."
+msgstr "ììì ìíí ëë ììë íë ëì ìì ìêë êìì íëë ììíëë."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
-msgid "Create a new folder for storing mail"
-msgstr "ëìì ììíë ì íëë ëëëë"
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:137
+msgid "ITIP"
+msgstr "ITIP"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
-msgid "Change the properties of this folder"
-msgstr "ì íëì ììì ëêëë"
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:143
+msgid "Display part as an invitation"
+msgstr "ì ëëì ìëë íìíëë"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
-msgid "Refresh the folder"
-msgstr "íëë ìë êì"
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:240
+msgid "Today %H:%M"
+msgstr "ìë %H:%M"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
-msgid "Change the name of this folder"
-msgstr "ì íëì ìëì ëêëë"
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:244
+msgid "Today %H:%M:%S"
+msgstr "ìë %H:%M:%S"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
-msgid "Select Message _Thread"
-msgstr "ëìì êíë ìí(_T)"
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:253
+msgid "Today %l:%M:%S %p"
+msgstr "ìë %p %l:%M:%S"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
-msgid "Select all messages in the same thread as the selected message"
-msgstr "ìíí ëììì êì êíëì ëë ëììë ìííëë"
+#. strftime format of a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:268
+msgid "Tomorrow %H:%M"
+msgstr "ìë %H:%M"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
-msgid "Select Message S_ubthread"
-msgstr "ëìì ìë êíë ìí(_U)"
+#. strftime format of a time,
+#. * in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:272
+msgid "Tomorrow %H:%M:%S"
+msgstr "ìë %H:%M:%S"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
-msgid "Select all replies to the currently selected message"
-msgstr "íì ìíí ëììì íìì ëë ìííëë"
+#. strftime format of a time,
+#. * in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:277
+msgid "Tomorrow %l:%M %p"
+msgstr "ëì %p %l:%M"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
-msgid "Empty _Trash"
-msgstr "ìì ëìì ëìê(_T)"
+#. strftime format of a time,
+#. * in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:281
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "ëì %p %l:%M:%S"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
-msgid "Permanently remove all the deleted messages from all accounts"
-msgstr "ëë íëì ììí ëììë ììí ìêíëë"
+#. strftime format of a weekday.
+#: ../modules/itip-formatter/itip-view.c:300
+#, c-format
+msgid "%A"
+msgstr "%A"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
-msgid "_New Label"
-msgstr "ì ëìë(_N)"
+#. strftime format of a weekday and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:305
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
-msgid "N_one"
-msgstr "ìì(_O)"
+#. strftime format of a weekday and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:309
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
-msgid "_Manage Subscriptions"
-msgstr "êë êë(_M)"
+#. strftime format of a weekday and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:314
+msgid "%A %l:%M %p"
+msgstr "%A %p %l:%M"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "ìê ìëì íëë êë/êëíì íëë"
+#. strftime format of a weekday and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:318
+msgid "%A %l:%M:%S %p"
+msgstr "%A %p %l:%M:%S"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
-msgid "Send / _Receive"
-msgstr "ëëê ëê(_R)"
+#. strftime format of a weekday and a date
+#. * without a year.
+#: ../modules/itip-formatter/itip-view.c:327
+msgid "%A, %B %e"
+msgstr "%B %eì %A"
 
-# tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
-msgid "Send queued items and retrieve new items"
-msgstr "ëë ëìì ëëê ì ëìì ëìëë"
+#. strftime format of a weekday, a date
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:333
+msgid "%A, %B %e %H:%M"
+msgstr "%B %eì %A, %H:%M"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
-msgid "R_eceive All"
-msgstr "ëë ëê(_E)"
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:337
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%B %eì %A, %H:%M:%S"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
-msgid "Receive new items from all accounts"
-msgstr "ëë êìì íëì ëìëë"
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:342
+msgid "%A, %B %e %l:%M %p"
+msgstr "%B %eì %A, %p %l:%M"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
-msgid "_Send All"
-msgstr "ëë ëëê(_S)"
+#. strftime format of a weekday, a date without a year
+#. * and a time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:346
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%B %eì %A, %p %l:%M:%S"
 
-# tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
-msgid "Send queued items in all accounts"
-msgstr "ëë êìì ëë íëì ëëëë"
+#. strftime format of a weekday and a date.
+#: ../modules/itip-formatter/itip-view.c:352
+msgid "%A, %B %e, %Y"
+msgstr "%Yë %B %eì %A"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
-#: ../widgets/misc/e-activity-proxy.c:313
-msgid "Cancel"
-msgstr "ìì"
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:357
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%Yë %B %eì %A, %H:%M"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
-msgid "Cancel the current mail operation"
-msgstr "íì ëì ëìì ììíëë"
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../modules/itip-formatter/itip-view.c:361
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%Yë %B %eì %A, %H:%M:%S"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1385
-msgid "Collapse All _Threads"
-msgstr "ëë êíë ìê(_T)"
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../modules/itip-formatter/itip-view.c:366
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%Yë %B %eì %A, %p %l:%M"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
-msgid "Collapse all message threads"
-msgstr "ëë ëìì êíëë ììëë"
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../modules/itip-formatter/itip-view.c:370
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%Yë %B %eì %A, %p %l:%M:%S"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1392
-msgid "E_xpand All Threads"
-msgstr "ëë êíë íìê(_X)"
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:409
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:499
+#: ../modules/itip-formatter/itip-view.c:588
+msgid "An unknown person"
+msgstr "ëëë ìë"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
-msgid "Expand all message threads"
-msgstr "ëë ëìì êíëì ìì ëììë ëìëë."
+#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:592
+#, c-format
+msgid "Please respond on behalf of %s"
+msgstr "%s ìêìë ìëíììì"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
-msgid "_Message Filters"
-msgstr "ëìì íí(_M)"
+#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:594
+#, c-format
+msgid "Received on behalf of %s"
+msgstr "%s ìêìë ëì"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
-msgid "Create or edit rules for filtering new mail"
-msgstr "ì ëì íí êìì ëëêë íìíëë"
+#: ../modules/itip-formatter/itip-view.c:420
+#, c-format
+msgid "%s through %s has published the following meeting information:"
+msgstr "%sëì %sì(ë) íí ëì ëì ìëë êìíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1406
-msgid "_Subscriptions..."
-msgstr "êë(_S)..."
+#: ../modules/itip-formatter/itip-view.c:422
+#, c-format
+msgid "%s has published the following meeting information:"
+msgstr "%sëì ëì ëì ìëë êìíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1415
-msgid "F_older"
-msgstr "íë(_O)"
+#: ../modules/itip-formatter/itip-view.c:427
+#, c-format
+msgid "%s has delegated the following meeting to you:"
+msgstr "%sëì ëì ëìì ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
-msgid "_Label"
-msgstr "ëìë(_L)"
+#: ../modules/itip-formatter/itip-view.c:430
+#, c-format
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%sëì %sì(ë) íí ëì ëìì ììíìêë ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
-msgid "C_reate Search Folder From Search..."
-msgstr "êìí êêë êì íë ëëê(_R)..."
+#: ../modules/itip-formatter/itip-view.c:432
+#, c-format
+msgid "%s requests your presence at the following meeting:"
+msgstr "%sëì ëì ëìì ììíìêë ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
-msgid "Search F_olders"
-msgstr "êì íë(_O)"
+#: ../modules/itip-formatter/itip-view.c:438
+#, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%sëì %sì(ë) íí êì ëìì ììíê ììíëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1448
-msgid "Create or edit search folder definitions"
-msgstr "êì íë ììë ëëêë íìíëë"
+#: ../modules/itip-formatter/itip-view.c:440
+#, c-format
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%sëì êì ëìì ììíê ììíëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
-msgid "_New Folder..."
-msgstr "ì íë(_N)..."
+#: ../modules/itip-formatter/itip-view.c:444
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%sëì %sì(ë) íí ëì ëìì ìì ìëë ëê ììíëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
-msgid "Show Message _Preview"
-msgstr "ëìì ëëëê ëìê(_P)"
+#: ../modules/itip-formatter/itip-view.c:446
+#, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%sëì ëì ëìì ìì ìëë ëê ììíëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
-msgid "Show message preview pane"
-msgstr "ëìì ëê ìì íìíëë"
+#: ../modules/itip-formatter/itip-view.c:450
+#, c-format
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%sëì %sì(ë) íí ëìê êì ëì ìëì ëëìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
-msgid "Show _Deleted Messages"
-msgstr "ììí ëìì ëìê(_D)"
+#: ../modules/itip-formatter/itip-view.c:452
+#, c-format
+msgid "%s has sent back the following meeting response:"
+msgstr "%sëì ëìê êì ëì ìëì ëëìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
-msgid "Show deleted messages with a line through them"
-msgstr "ììí ëììë ìì êì íìíëë"
+#: ../modules/itip-formatter/itip-view.c:456
+#, c-format
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%sëì %sì(ë) íí ëì ëìì ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
-msgid "_Group By Threads"
-msgstr "êíëë ëì(_G)"
+#: ../modules/itip-formatter/itip-view.c:458
+#, c-format
+msgid "%s has canceled the following meeting:"
+msgstr "%sëì ëì ëìì ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
-msgid "Threaded message list"
-msgstr "ìêë ëìì ëë"
+#: ../modules/itip-formatter/itip-view.c:462
+#, c-format
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%sëì %sì(ë) íí ëì ëì ëêì ììíìëë."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
-msgid "Show message preview below the message list"
-msgstr "ëìì ëë ìëì ëìì ëë ëêë íìíëë"
+#: ../modules/itip-formatter/itip-view.c:464
+#, c-format
+msgid "%s has proposed the following meeting changes:"
+msgstr "%sëì ëì ëì ëêì ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
-msgid "Show message preview alongside the message list"
-msgstr "ëìì ëëê ëëí ëìì ëë ëêë íìíëë"
+#: ../modules/itip-formatter/itip-view.c:468
+#, c-format
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%sëì %sì(ë) íí ëì ëì ëêì êìíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
-msgid "All Messages"
-msgstr "ëë ëìì"
+#: ../modules/itip-formatter/itip-view.c:470
+#, c-format
+msgid "%s has declined the following meeting changes:"
+msgstr "%sëì ëì ëì ëêì êìíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
-msgid "Important Messages"
-msgstr "ììí ëìì"
+#: ../modules/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has published the following task:"
+msgstr "%sëì %sì(ë) íí ëì ììì êìíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
-msgid "Last 5 Days' Messages"
-msgstr "ìê 5ìê ëìì"
+#: ../modules/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has published the following task:"
+msgstr "%sëì ëì ììì êìíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1586
-msgid "Messages Not Junk"
-msgstr "ìíëì ìë ëìì"
+#: ../modules/itip-formatter/itip-view.c:517
+#, c-format
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%sëì ëì ììì %sëì íëì ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
-msgid "Messages with Attachments"
-msgstr "ìëê ìë ëìì"
+#: ../modules/itip-formatter/itip-view.c:520
+#, c-format
+msgid "%s through %s has assigned you a task:"
+msgstr "%sëì %sì(ë) íí ììì íëíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
-msgid "No Label"
-msgstr "ëìë ìì"
+#: ../modules/itip-formatter/itip-view.c:522
+#, c-format
+msgid "%s has assigned you a task:"
+msgstr "%sëì ììì íëíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
-msgid "Read Messages"
-msgstr "ìì ëìì"
+#: ../modules/itip-formatter/itip-view.c:528
+#, c-format
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%sëì %sì(ë) íí êì ììì ììíê ììíëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
-msgid "Recent Messages"
-msgstr "ìê ëìì"
+#: ../modules/itip-formatter/itip-view.c:530
+#, c-format
+msgid "%s wishes to add to an existing task:"
+msgstr "%sëì êì ììì ììíê ììíëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
-msgid "Unread Messages"
-msgstr "ìì ìì ëìì"
+#: ../modules/itip-formatter/itip-view.c:534
+#, c-format
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr "%sëì %sì(ë) íí ëì ìì íëì ìê ìëë ëê ììíëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
-msgid "Subject or Addresses contain"
-msgstr "ìëìë ììì íí"
+#: ../modules/itip-formatter/itip-view.c:536
+#, c-format
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%sëì ëì ìì íëì ìê ìëë ëê ììíëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
-msgid "All Accounts"
-msgstr "ëë êì"
+# FIXME: through what?
+#: ../modules/itip-formatter/itip-view.c:540
+#, c-format
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%sëì %sì(ë) íí ëì ìì íë ìëì ëëìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
-msgid "Current Account"
-msgstr "íì êì"
+#: ../modules/itip-formatter/itip-view.c:542
+#, c-format
+msgid "%s has sent back the following assigned task response:"
+msgstr "%sëì ëì ìì íë ìëì ëëìëë:"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
-msgid "Current Folder"
-msgstr "íì íë"
+#: ../modules/itip-formatter/itip-view.c:546
+#, c-format
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%sëì %sì(ë) íí ëì íë ììì ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view.c:560
-msgid "All Account Search"
-msgstr "ëë êì êì"
+#: ../modules/itip-formatter/itip-view.c:548
+#, c-format
+msgid "%s has canceled the following assigned task:"
+msgstr "%sëì ëì íë ììì ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view.c:721
-msgid "Account Search"
-msgstr "êì êì"
+#: ../modules/itip-formatter/itip-view.c:552
+#, c-format
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%sëì %sì(ë) íí ëì ìì íë ëêì ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view.c:945
-msgid "Proxy _Logout"
-msgstr "íëì ëêìì(_L)"
+#: ../modules/itip-formatter/itip-view.c:554
+#, c-format
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%sëì ëì ìì íë ëêì ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/itip-formatter/itip-view.c:558
 #, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%dê ìí, "
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%sëì %sì(ë) íí ëì ìì íëì êìíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/itip-formatter/itip-view.c:560
 #, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%dê ìì"
+msgid "%s has declined the following assigned task:"
+msgstr "%sëì ëì ìì íëì êìíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1040
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/itip-formatter/itip-view.c:599
 #, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%dê ìí"
+msgid "%s through %s has published the following memo:"
+msgstr "%sëì %sì(ë) íí ëì ëëë êìíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/itip-formatter/itip-view.c:601
 #, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%dê ìì"
+msgid "%s has published the following memo:"
+msgstr "%sëì ëì ëëë êìíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../modules/itip-formatter/itip-view.c:606
 #, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%dê ì ëë"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%sëì %sì(ë) íí êì ëëì ëìì ìêíê ììíëë:"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1065
+#: ../modules/itip-formatter/itip-view.c:608
 #, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%dê ëë"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%sëì êì ëëì ëìì ìêíê ììíëë:"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../modules/itip-formatter/itip-view.c:612
 #, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%dê ì ìì, "
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%sëì %sì(ë) íí ëì êì ëëë ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../modules/itip-formatter/itip-view.c:614
 #, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "ìì %dê"
+msgid "%s has canceled the following shared memo:"
+msgstr "%sëì ëì êì ëëë ììíìëë:"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
-msgid "Trash"
-msgstr "ìì ëìì"
+#: ../modules/itip-formatter/itip-view.c:687
+msgid "All day:"
+msgstr "íë ìì:"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1579
-msgid "Send / Receive"
-msgstr "ëëê / ëê"
+#: ../modules/itip-formatter/itip-view.c:693
+msgid "Start day:"
+msgstr "ìì ëì:"
 
-#: ../modules/mail/em-composer-prefs.c:513
-msgid "Language(s)"
-msgstr "ìì"
+#: ../modules/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:1461
+msgid "Start time:"
+msgstr "ìì ìê:"
 
-#: ../modules/mail/em-mailer-prefs.c:89
-msgid "Every time"
-msgstr "íì"
+#: ../modules/itip-formatter/itip-view.c:702
+msgid "End day:"
+msgstr "ë ëì:"
 
-#: ../modules/mail/em-mailer-prefs.c:90
-msgid "Once per day"
-msgstr "ëì"
+#: ../modules/itip-formatter/itip-view.c:702
+#: ../modules/itip-formatter/itip-view.c:1462
+msgid "End time:"
+msgstr "ëì ìê:"
 
-#: ../modules/mail/em-mailer-prefs.c:91
-msgid "Once per week"
-msgstr "ëì"
+#: ../modules/itip-formatter/itip-view.c:1010
+msgid "_Open Calendar"
+msgstr "ëë ìê(_O)"
 
-#: ../modules/mail/em-mailer-prefs.c:92
-msgid "Once per month"
-msgstr "ëë"
+#: ../modules/itip-formatter/itip-view.c:1013
+msgid "_Decline all"
+msgstr "ëë êë(_D)"
 
-#: ../modules/mail/em-mailer-prefs.c:293
-msgid "Header"
-msgstr "íë"
+#: ../modules/itip-formatter/itip-view.c:1016
+msgid "_Decline"
+msgstr "êë(_D)"
 
-#: ../modules/mail/em-mailer-prefs.c:297
-msgid "Contains Value"
-msgstr "ê íí"
+#: ../modules/itip-formatter/itip-view.c:1019
+msgid "_Tentative all"
+msgstr "ëë ììì(_T)"
 
-#. 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:1069
-msgid "_Date header:"
-msgstr "ëì íë(_D):"
+#: ../modules/itip-formatter/itip-view.c:1022
+msgid "_Tentative"
+msgstr "ììì(_T)"
 
-#: ../modules/mail/em-mailer-prefs.c:1070
-msgid "Show _original header value"
-msgstr "ìë íë ê íì(_O)"
+#: ../modules/itip-formatter/itip-view.c:1025
+msgid "A_ccept all"
+msgstr "ëë ìë(_C)"
+
+#: ../modules/itip-formatter/itip-view.c:1028
+msgid "A_ccept"
+msgstr "ìë(_C)"
+
+#: ../modules/itip-formatter/itip-view.c:1031
+msgid "_Send Information"
+msgstr "ìë ëëê(_S)"
+
+#: ../modules/itip-formatter/itip-view.c:1034
+msgid "_Update Attendee Status"
+msgstr "ììì ìí ìëìí(_U)"
+
+#: ../modules/itip-formatter/itip-view.c:1037
+msgid "_Update"
+msgstr "ìëìí(_U)"
+
+#: ../modules/itip-formatter/itip-view.c:1464
+#: ../modules/itip-formatter/itip-view.c:1512
+#: ../modules/itip-formatter/itip-view.c:1581
+msgid "Comment:"
+msgstr "ìë:"
+
+#. RSVP area
+#: ../modules/itip-formatter/itip-view.c:1500
+msgid "Send reply to sender"
+msgstr "ëë ììê íì"
+
+#. Updates
+#: ../modules/itip-formatter/itip-view.c:1515
+msgid "Send _updates to attendees"
+msgstr "ììììê ìëìí ëëê(_U)"
+
+#. The recurrence check button
+#: ../modules/itip-formatter/itip-view.c:1518
+msgid "_Apply to all instances"
+msgstr "ëë êìì ìì(_A)"
+
+#: ../modules/itip-formatter/itip-view.c:1519
+msgid "Show time as _free"
+msgstr "ìêì ìì ìììë íì(_F)"
+
+#: ../modules/itip-formatter/itip-view.c:1520
+msgid "_Preserve my reminder"
+msgstr "ë ëë ìë ìì(_P)"
+
+#: ../modules/itip-formatter/itip-view.c:1521
+msgid "_Inherit reminder"
+msgstr "ëë ìë ìì(_I)"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
-msgid "Do you want to make Evolution your default email client?"
-msgstr "ìëëìì êë ììëì íëêëìë íìêìëê?"
+#: ../modules/itip-formatter/itip-view.c:1845
+msgid "_Tasks:"
+msgstr "ìì(_T):"
 
-#. Translators: First %s is an email address, second %s
-#. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:258
+#: ../modules/itip-formatter/itip-view.c:1848
+msgid "_Memos:"
+msgstr "ëë(_M):"
+
+#. Translators: The first '%s' is replaced with a calendar name,
+#. * the second '%s' with an error message
+#: ../modules/itip-formatter/itip-view.c:3493
 #, c-format
-msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr "%sìê ëë \"%s\"ì êí (ëë ë %s) ëììë ìììëë."
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "'%s' ëëì ììëìëë ìííìëë (%s)"
 
-#. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:324
+# event -> íì, Microsoft Office XP ìê
+#: ../modules/itip-formatter/itip-view.c:3652
 #, c-format
-msgid "Delivery Notification for \"%s\""
-msgstr "ëì ëìì ëí ëë íì: \"%s\""
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "'%s' ëëì ëì ìë ììì ì ëìê ìëíëë"
 
-#: ../modules/mdn/evolution-mdn.c:449
+#: ../modules/itip-formatter/itip-view.c:3679
 #, c-format
-msgid "Send a read receipt to '%s'"
-msgstr "ëìì ëìì ìì íì ëëê: '%s'"
+msgid "Found the appointment in the calendar '%s'"
+msgstr "'%s' ëëì ììì ëêíìëë"
 
-#. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:454
-msgid "_Notify Sender"
-msgstr "ëë íì ëëê(_N)"
+#: ../modules/itip-formatter/itip-view.c:3774
+msgid "Unable to find any calendars"
+msgstr "ëëì íëë ìì ì ììëë"
 
-#: ../modules/mdn/evolution-mdn.error.xml.h:1
-msgid "Sender wants to be notified when you have read this message."
-msgstr "ì ëììë ììëì ëë ìëì íìì ëê ìì íëë."
+#: ../modules/itip-formatter/itip-view.c:3782
+msgid "Unable to find this meeting in any calendar"
+msgstr "ìë ëëììë ì ëìì ìì ì ììëë"
 
-#: ../modules/mdn/evolution-mdn.error.xml.h:2
-msgid "Sender has been notified that you have read this message."
-msgstr "ì ëììë ììì ë ëë ìëì íìì ëììëë."
+#: ../modules/itip-formatter/itip-view.c:3787
+msgid "Unable to find this task in any task list"
+msgstr "ìë ìì ëëììë ì ììì ìì ì ììëë"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
-msgid "Evolution is currently offline."
-msgstr "ìëëìì íì ìê ìì ìíìëë."
+#: ../modules/itip-formatter/itip-view.c:3792
+msgid "Unable to find this memo in any memo list"
+msgstr "ìë ëë ëëììë ì ëëë ìì ì ììëë"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-msgid "Click 'Work Online' to return to online mode."
-msgstr "ìê ëëë ëìêëë 'ìê ìí ìì'ì ëëììì."
+#: ../modules/itip-formatter/itip-view.c:4132
+msgid "Opening the calendar. Please wait..."
+msgstr "ëëì ìë ììëë. ìì êëëììì..."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-msgid "Evolution is currently offline due to a network outage."
-msgstr "ëíìí ìêì ëìì ìëëìì íì ìê ìì ìíìëë."
+#: ../modules/itip-formatter/itip-view.c:4137
+msgid "Searching for an existing version of this appointment"
+msgstr "ì ììì íì ëìì ìë ììëë"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-msgid ""
-"Evolution will return to online mode once a network connection is "
-"established."
-msgstr "ëíìíê ìêëë ìëëìì ìê ìíë ëëìêëë."
+#: ../modules/itip-formatter/itip-view.c:4523
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "íëì '%s' ëëì ëë ì ììëë.  %s"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:388
-msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-msgstr ""
-"ìì ííì ìì org.gnome.OnlineAccounts ìëìì êìì ìì ì ììëë."
+#: ../modules/itip-formatter/itip-view.c:4538
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "'%s' ëëì ìëìëê ëë"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:475
-msgid "OAuth"
-msgstr "OAuth"
+#: ../modules/itip-formatter/itip-view.c:4543
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "'%s' ëëì ëììëê ëë"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:477
-msgid ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-msgstr ""
-"ì ììì êë ìëì êì ìëìì ìêíë ëëìë ìëì ìêíëë"
+#: ../modules/itip-formatter/itip-view.c:4549
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "'%s' ëëì êììëê ëë"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
-msgid "Author(s)"
-msgstr "êëì"
+#: ../modules/itip-formatter/itip-view.c:4555
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr "'%s' ëëì ììëê ëë"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:255
-msgid "Plugin Manager"
-msgstr "íëêì êëì"
+#: ../modules/itip-formatter/itip-view.c:4576
+#: ../modules/itip-formatter/itip-view.c:5016
+#: ../modules/itip-formatter/itip-view.c:5123
+msgid "Saving changes to the calendar. Please wait..."
+msgstr "ëë ìíì ëëì ììíë ììëë. ìì êëëììì..."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:270
-msgid "Note: Some changes will not take effect until restart"
-msgstr "ìì: ìë ëë ìíì ëì ììíì ììëëë"
+#: ../modules/itip-formatter/itip-view.c:4617
+msgid "Unable to parse item"
+msgstr "íëì íìí ì ììëë"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:299
-msgid "Overview"
-msgstr "êì"
+#: ../modules/itip-formatter/itip-view.c:4807
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr "ìììê ëëì %sì(ë) ìììëë"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:368
-#: ../modules/plugin-manager/evolution-plugin-manager.c:451
-msgid "Plugin"
-msgstr "íëêì"
+#: ../modules/itip-formatter/itip-view.c:4822
+msgid "Sent a cancelation notice to the delegate"
+msgstr "ëëììê ìì êìë ëëìëë"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
-msgid "_Plugins"
-msgstr "íëêì(_P)"
+#: ../modules/itip-formatter/itip-view.c:4826
+msgid "Could not send the cancelation notice to the delegate"
+msgstr "ëëììê ìì êìë ëë ì ììëë"
 
-# ëë ìë, ëììë ëì
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
-msgid "Enable and disable plugins"
-msgstr "íëêìì ììíêë íìíëë"
+#: ../modules/itip-formatter/itip-view.c:4874
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr "ìììë ìëìíí ì ììëë. %s"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "íìì íìí íëêì"
+#: ../modules/itip-formatter/itip-view.c:4882
+msgid "Attendee status updated"
+msgstr "ììì ìíë ìëìííìëë"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "íìì EPlugin ëë íìí íëêì."
+#: ../modules/itip-formatter/itip-view.c:4905
+msgid "The meeting is invalid and cannot be updated"
+msgstr "ìëìíê ìëëìê ìëìíí ì ììëë"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Python Plugin Loader tests"
-msgstr "íìì íëêì ëë íìí"
+#: ../modules/itip-formatter/itip-view.c:4981
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "ìëë ìí ëëì ììì ìíë ìëìíí ì ììëë"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Hello Python"
-msgstr "íë íìì"
+#: ../modules/itip-formatter/itip-view.c:5053
+#: ../modules/itip-formatter/itip-view.c:5093
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "ì íëì ë ìì ìê ëëì ììì ìíë ìëìíí ì ììëë"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:190
-#, c-format
-msgid "Failed to spawn SpamAssassin (%s): "
-msgstr "ìíìììì ììíëë ìííìëë (%s): "
+#: ../modules/itip-formatter/itip-view.c:5156
+msgid "Meeting information sent"
+msgstr "ëì ìëë ëëìëë"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:213
-msgid "Failed to stream mail message content to SpamAssassin: "
-msgstr "ëì ëìì ëìì ìíìììì ìëíëë ìííìëë: "
+#: ../modules/itip-formatter/itip-view.c:5161
+msgid "Task information sent"
+msgstr "ìì ìëë ëëìëë"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:232
-#, c-format
-msgid "Failed to write '%s' to SpamAssassin: "
-msgstr "ìíìììì '%s' ëìíë ìëë ìííìëë: "
+#: ../modules/itip-formatter/itip-view.c:5166
+msgid "Memo information sent"
+msgstr "ëë ìëë ëëìëë"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:260
-msgid "Failed to read output from SpamAssassin: "
-msgstr "ìíììììì ìëì ìëë ìííìëë: "
+#: ../modules/itip-formatter/itip-view.c:5177
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "ëì ìëë ëë ì ììëë. íë ëìì ììëë"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:315
-msgid "SpamAssassin either crashed or failed to process a mail message"
-msgstr "ìíìììì ìì ìëíêë ëì ëììë ìëíëë ìííìëë"
+#: ../modules/itip-formatter/itip-view.c:5182
+msgid "Unable to send task information, the task does not exist"
+msgstr "ìì ìëë ëë ì ììëë. íë ììì ììëë"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:834
-msgid "SpamAssassin Options"
-msgstr "ìíììì ìì"
+#: ../modules/itip-formatter/itip-view.c:5187
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "ëë ìëë ëë ì ììëë. íë ëëê ììëë"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:849
-msgid "I_nclude remote tests"
-msgstr "ìê íìí íí(_N)"
+#. Translators: This is a default filename for a calendar.
+#: ../modules/itip-formatter/itip-view.c:5252
+msgid "calendar.ics"
+msgstr "ëë.ics"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:863
-msgid "This will make SpamAssassin more reliable, but slower."
-msgstr "ìëê íë ìíìììì ë ììììë ìëíìë, ë ëëëë."
+#: ../modules/itip-formatter/itip-view.c:5257
+msgid "Save Calendar"
+msgstr "ëë ìì"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1072
-msgid "SpamAssassin"
-msgstr "ìíììì"
+#: ../modules/itip-formatter/itip-view.c:5310
+#: ../modules/itip-formatter/itip-view.c:5323
+msgid "The calendar attached is not valid"
+msgstr "ìëí ëëì ìëëììëë"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:136
+#: ../modules/itip-formatter/itip-view.c:5311
+#: ../modules/itip-formatter/itip-view.c:5324
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications."
-msgstr "ìëëìì ììíê ëì êì íìíëë. ëìì ì ë êì íëìì ìëëììë ììëì êìì ìêíëë ììíê, ëë íëêëìì ìë íìëì êììê ëëë."
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:297
-#: ../widgets/misc/e-import-assistant.c:403
-msgid "Please select the information that you would like to import:"
-msgstr "ëììì êììê ìì ìëë ìííììì:"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:329
-#: ../widgets/misc/e-import-assistant.c:559
-#, c-format
-msgid "From %s:"
-msgstr "%sìì:"
-
-# ìì tab, ìí íìê ìë
-#: ../modules/startup-wizard/evolution-startup-wizard.c:340
-#: ../modules/startup-wizard/evolution-startup-wizard.c:438
-msgid "Importing Files"
-msgstr "íì êììê"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:416
-msgid "Import cancelled."
-msgstr "êììê ììí."
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+"ëììì ëëì ëì ìëê ëì ììë, ê ëëì ìëë iCalendarê ìëë"
+"ë."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:434
-msgid "Import complete."
-msgstr "êììê ëì."
+#: ../modules/itip-formatter/itip-view.c:5366
+#: ../modules/itip-formatter/itip-view.c:5396
+#: ../modules/itip-formatter/itip-view.c:5496
+msgid "The item in the calendar is not valid"
+msgstr "ëë ìì íëì ìëëì ììëë"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:508
-msgid "Evolution Setup Assistant"
-msgstr "ìëëì ìì ëìë"
+# free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
+#: ../modules/itip-formatter/itip-view.c:5367
+#: ../modules/itip-formatter/itip-view.c:5397
+#: ../modules/itip-formatter/itip-view.c:5497
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"ëììì ëëì ëì ììë, ëëì íì, ìì, ìì ìì/ìì ìëê íëë "
+"ëì ìì ììëë."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:514
-msgid "Welcome"
-msgstr "íìíëë"
+#: ../modules/itip-formatter/itip-view.c:5412
+msgid "The calendar attached contains multiple items"
+msgstr "ìëí ëëì ìë êì íëì ëì ììëë"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:626
-msgid "Loading accounts..."
-msgstr "êì ììëìë ì..."
+#: ../modules/itip-formatter/itip-view.c:5413
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr "ì íëì ëë ìëíëë, íìì ììíì ê ëëì êììì íëë."
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "ëì ììë"
+#: ../modules/itip-formatter/itip-view.c:5937
+msgctxt "cal-itip"
+msgid "None"
+msgstr "ìì"
 
-# command line help
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Add local address books to Evolution."
-msgstr "ëì ììëì ìëëìì ìêíëë."
+#: ../modules/itip-formatter/itip-view.c:5953
+msgid "Tentatively Accepted"
+msgstr "ììììë ìë"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:136
-msgid "_Do not show this message again."
-msgstr "ì ëììë ëì ëì ìê(_D)."
+#: ../modules/itip-formatter/itip-view.c:6096
+msgid "This meeting recurs"
+msgstr "ì ìì ëë"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:484
-#: ../plugins/templates/templates.c:462
-msgid "Keywords"
-msgstr "íìë"
+#: ../modules/itip-formatter/itip-view.c:6099
+msgid "This task recurs"
+msgstr "ì ìì ëë"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Message has no attachments"
-msgstr "ëììì ìëê ììëë"
+#: ../modules/itip-formatter/itip-view.c:6102
+msgid "This memo recurs"
+msgstr "ì ëë ëë"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
-"ì ëìììì ìë íìì ëì ììì íëë íìëë ìììë, ìë íìì "
-"ììëë."
+"íì ìììê ìë ìëì ì íìì íìëë. ìììë ìêíìêìëê?"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add Attachment..."
-msgstr "ìëíì ìê(_A)..."
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "This meeting has been delegated"
+msgstr "ì ëìì ììëììëë"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Edit Message"
-msgstr "ëìì íì(_E)"
+#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "'{0}'ì(ê) ëìì ììíìëë. {1} ëëìì ìêíìêìëê?"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "ìë ìë"
+#: ../modules/itip-formatter/plugin/config-ui.c:82
+msgid "Meeting Invitations"
+msgstr "ëì ìë"
+
+#: ../modules/itip-formatter/plugin/config-ui.c:108
+msgid "_Delete message after acting"
+msgstr "ììí ëìì ëìì ìì(_D)"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr "ëì ëììì ìë ìêë ììì ë ìëëë."
+#: ../modules/itip-formatter/plugin/config-ui.c:122
+#: ../modules/itip-formatter/plugin/config-ui.c:153
+msgid "Conflict Search"
+msgstr "ìë êì"
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Inline Audio"
-msgstr "ëì ìëì"
+#. Source selector
+#: ../modules/itip-formatter/plugin/config-ui.c:137
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "ìëíë ëìì ìì ëëì ìííììì"
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly in mail messages."
-msgstr "ìëì ìëë ëì ëìììì ìì ììíëë."
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Itip Formatter"
+msgstr "ITIP íëí"
 
-#: ../plugins/backup-restore/backup.c:77
-msgid "Back up Evolution directory"
-msgstr "ìëëì ëëíë ëì"
+#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "ëì ëììì \"text/calendar\" MIME ëëì íìíëë."
 
-#: ../plugins/backup-restore/backup.c:79
-msgid "Restore Evolution directory"
-msgstr "ìëëì ëëíë ëê"
+#: ../modules/mail-config/e-mail-config-google-summary.c:252
+msgid "Google Features"
+msgstr "êê êë"
 
-#: ../plugins/backup-restore/backup.c:81
-msgid "Check Evolution Back up"
-msgstr "ìëëì ëì êì"
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
+msgid "Add Google Ca_lendar to this account"
+msgstr "êê ëëì ìëëìì ìê(_L)"
 
-#: ../plugins/backup-restore/backup.c:83
-msgid "Restart Evolution"
-msgstr "ìëëì ëì ìì"
+#: ../modules/mail-config/e-mail-config-google-summary.c:269
+msgid "Add Google Con_tacts to this account"
+msgstr "êê ììëì ìëëìì ìê(_T)"
 
-#: ../plugins/backup-restore/backup.c:85
-msgid "With Graphical User Interface"
-msgstr "êëí ììì ìííìì ìì"
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
+msgid "You may need to enable IMAP access"
+msgstr "IMAP ìêì ììíì í ìë ììëë"
 
-#. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:308
-#: ../plugins/backup-restore/backup.c:432
-msgid "Shutting down Evolution"
-msgstr "ìëëìì ìëíë ììëë"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+msgid "Mail _Directory:"
+msgstr "ëì ëëíë(_D):"
 
-#: ../plugins/backup-restore/backup.c:317
-msgid "Backing Evolution accounts and settings"
-msgstr "ìëëì êì ë ììì ëìíë ì"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+msgid "Choose a MH mail directory"
+msgstr "MH ëì ëëíëë ìííììì"
 
-#: ../plugins/backup-restore/backup.c:329
-msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "ìëëì ëìíë ëìíë ì (ëì, ìëì, ëë, ìì, ëë)"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+msgid "Local Delivery _File:"
+msgstr "ëì ìì íì(_F):"
 
-#: ../plugins/backup-restore/backup.c:345
-msgid "Back up complete"
-msgstr "ëì ìë"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+msgid "Choose a local delivery file"
+msgstr "ëì ìì íìì ìííììì"
 
-#: ../plugins/backup-restore/backup.c:352
-#: ../plugins/backup-restore/backup.c:570
-msgid "Restarting Evolution"
-msgstr "ìëëì ëì ììíë ì"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+msgid "Choose a Maildir mail directory"
+msgstr "MAILDIR ëì ëëíëë ìííììì"
 
-#: ../plugins/backup-restore/backup.c:438
-msgid "Back up current Evolution data"
-msgstr "íì ìëëì ëìíë ëì"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+msgid "Spool _File:"
+msgstr "ìí íì(_F):"
 
-#: ../plugins/backup-restore/backup.c:446
-msgid "Extracting files from back up"
-msgstr "ëììì íìì ììíë ì"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+msgid "Choose a mbox spool file"
+msgstr "MBOX ìí íìì ìííììì"
 
-#: ../plugins/backup-restore/backup.c:515
-msgid "Loading Evolution settings"
-msgstr "ìëëì ììì ìììë ì"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+msgid "Spool _Directory:"
+msgstr "ìí ëëíë(_D):"
 
-#: ../plugins/backup-restore/backup.c:551
-msgid "Removing temporary back up files"
-msgstr "ìì ëì íìì ììíë ì"
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+msgid "Choose a mbox spool directory"
+msgstr "MBOX ìí ëëíëë ìííììì"
 
-#: ../plugins/backup-restore/backup.c:563
-msgid "Ensuring local sources"
-msgstr "ëì ìì íìíë ì"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:82
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "ìì"
 
-#: ../plugins/backup-restore/backup.c:767
-msgid "Evolution Back Up"
-msgstr "ìëëì ëì"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:100
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "ìë(_S):"
 
-#: ../plugins/backup-restore/backup.c:768
-#, c-format
-msgid "Backing up to the folder %s"
-msgstr "%s íëì ëìíë ì"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:193
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:229
+msgid "User_name:"
+msgstr "ììììë(_N):"
 
-#: ../plugins/backup-restore/backup.c:772
-msgid "Evolution Restore"
-msgstr "ìëëì ëê"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:150
+msgid "Encryption _method:"
+msgstr "ìíí ëì(_M):"
 
-#: ../plugins/backup-restore/backup.c:773
-#, c-format
-msgid "Restoring from the folder %s"
-msgstr "%s íëìì ëêíë ì"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:165
+msgid "STARTTLS after connecting"
+msgstr "ìê ëì STARTTLS"
 
-#: ../plugins/backup-restore/backup.c:841
-msgid "Backing up Evolution Data"
-msgstr "ìëëì ëìíë ëìíë ììëë"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:169
+msgid "SSL on a dedicated port"
+msgstr "SSL, íì íí ìì"
 
-#: ../plugins/backup-restore/backup.c:842
-msgid "Please wait while Evolution is backing up your data."
-msgstr "ìëëììì ëìíë ëìíë ëì ìì êëëììì."
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:125
+msgid "Ser_ver requires authentication"
+msgstr "ìëì ììì íì(_V)"
 
-#: ../plugins/backup-restore/backup.c:844
-msgid "Restoring Evolution Data"
-msgstr "ìëëì ëìíë ëêíë ììëë"
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:211
+msgid "T_ype:"
+msgstr "ìë(_Y):"
 
-#: ../plugins/backup-restore/backup.c:845
-msgid "Please wait while Evolution is restoring your data."
-msgstr "ìëëììì ëìíë ëêíë ëì ìì êëëììì."
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+msgid "Yahoo! Features"
+msgstr "ìí! êë"
 
-#: ../plugins/backup-restore/backup.c:863
-msgid "This may take a while depending on the amount of data in your account."
-msgstr "ì ììì êìì ëìí íêì ëë ìêì êë ìë ììëë."
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
+msgid "Add Yahoo! Ca_lendar and Tasks to this account"
+msgstr "ìí! ëëê ììì ì êìì ìê(_L)"
 
-#: ../plugins/backup-restore/backup-restore.c:225
-msgid "Select name of the Evolution backup file"
-msgstr "ìëëì ëì íì ìë ìí"
+#: ../modules/mail/e-mail-attachment-handler.c:390
+#, c-format
+msgid "%d attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "ìëí ëìì %dê"
 
-#: ../plugins/backup-restore/backup-restore.c:258
-msgid "_Restart Evolution after backup"
-msgstr "ëìí ëìì ìëëì ëì ìì(_R)"
+#: ../modules/mail/e-mail-shell-backend.c:244
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "ëì ëìì(_M)"
 
-#: ../plugins/backup-restore/backup-restore.c:285
-msgid "Select name of the Evolution backup file to restore"
-msgstr "ëêí ìëëì ëì íì ìë ìí"
+#: ../modules/mail/e-mail-shell-backend.c:246
+msgid "Compose a new mail message"
+msgstr "ëì ëììë ìë ììíëë"
 
-#: ../plugins/backup-restore/backup-restore.c:298
-msgid "_Restart Evolution after restore"
-msgstr "ëêí ëìì ìëëì ëì ìì(_R)"
+#: ../modules/mail/e-mail-shell-backend.c:254
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "ëì êì(_U)"
 
-#: ../plugins/backup-restore/backup-restore.c:385
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-msgstr ""
-"ëììì ìëëìì ëêí ì ììëë. ëì, ëë, ìì, ëë, ìëì ëë"
-"ë ëêí ì ììëë. ëë êì ìì, ëì íí êë ëë ëêíëë."
+#: ../modules/mail/e-mail-shell-backend.c:256
+msgid "Create a new mail account"
+msgstr "ì ëì êìì ëëëë"
 
-#: ../plugins/backup-restore/backup-restore.c:395
-msgid "_Restore Evolution from the backup file"
-msgstr "ëì ëì íììì ìëëì ëê(_R)"
+#: ../modules/mail/e-mail-shell-backend.c:261
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "ëì íë(_F)"
 
-#: ../plugins/backup-restore/backup-restore.c:405
-msgid "Please select an Evolution Archive to restore:"
-msgstr "ëêí ìëëì ìììëë ìíí ìììì:"
+#: ../modules/mail/e-mail-shell-backend.c:263
+msgid "Create a new mail folder"
+msgstr "ì ëì íëë ëëëë"
 
-#: ../plugins/backup-restore/backup-restore.c:409
-msgid "Choose a file to restore"
-msgstr "ëêí íìì ìííììì"
+#: ../modules/mail/e-mail-shell-backend.c:561
+msgid "Mail Accounts"
+msgstr "ëì êì"
 
-#: ../plugins/backup-restore/backup-restore.c:423
-msgid "Restore from backup"
-msgstr "ëììì ëê"
+#: ../modules/mail/e-mail-shell-backend.c:570
+msgid "Mail Preferences"
+msgstr "ëì êë ìì"
 
-#: ../plugins/backup-restore/backup-restore.c:470
-msgid "_Back up Evolution Data..."
-msgstr "ìëëì ëìí ëì(_B)..."
+#: ../modules/mail/e-mail-shell-backend.c:579
+msgid "Composer Preferences"
+msgstr "ëì ìì êë ìì"
 
-#: ../plugins/backup-restore/backup-restore.c:472
-msgid "Back up Evolution data and settings to an archive file"
-msgstr "ìëëì ëìí ë ììì ìì íìì ëìíëë"
+#: ../modules/mail/e-mail-shell-backend.c:588
+msgid "Network Preferences"
+msgstr "ëíìí êë ìì"
 
-#: ../plugins/backup-restore/backup-restore.c:477
-msgid "R_estore Evolution Data..."
-msgstr "ìëëì ëìí ëê(_E)..."
+#. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
+#: ../modules/mail/e-mail-shell-backend.c:890
+msgctxt "label"
+msgid "None"
+msgstr "ìì"
 
-#: ../plugins/backup-restore/backup-restore.c:479
-msgid "Restore Evolution data and settings from an archive file"
-msgstr "ìëëì ëìí ë ììì ìì íììì ëêíëë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view.c:975
+msgid "_Disable Account"
+msgstr "êì ìì ìê(_D)"
 
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Back up and Restore"
-msgstr "ëì ë ëê"
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
+msgid "Disable this account"
+msgstr "ì êìì ììíì ììëë"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Back up and restore your Evolution data and settings."
-msgstr "ìëëì ëìí ë ììì ëìíê ëêíëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "ëë íëì ììí ëììë ììí ìêíëë"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Invalid Evolution backup file"
-msgstr "ìëëì ëì íìì ìëëììëë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
+msgid "Edit properties of this account"
+msgstr "ì êìì ììì íìíëë"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "ëêí ìëë ëì íìì ìííììì."
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
+msgid "_Download Messages for Offline Usage"
+msgstr "ìê ìì ìí ìëë ëìì ëìëë(_D)"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Are you sure you want to close Evolution?"
-msgstr "ìëë ìëëìì ìëíìêìëê?"
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "ìê ìì ìí ìììë íìí êì ë íëì ëììë ëìëëíëë"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid ""
-"To back up your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding."
-msgstr ""
-"ëìíì ììì ëìíëë, ëì ìëëìì ëìììì. ììíì ìì ëìí"
-"ê ììë êì íìê ìì ëë ììíììì."
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
+msgid "Fl_ush Outbox"
+msgstr "ëë íìí íëì(_U)"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "ìëëìì ëê ëì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
+msgid "_Copy Folder To..."
+msgstr "íë ëì(_C)..."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "ìíí ëì íììì ìëë ìëëìì ëêíìêìëê?"
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
+msgid "Copy the selected folder into another folder"
+msgstr "ìíí íëë ëë íëë ëìíëë"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid ""
-"To restore your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
-msgstr ""
-"ëìíì ììì ëêíëë, ëì ìëëìì ëìììì. ììíì ìì ëìí"
-"ê ììë êì íìê ìì ëë ììíììì. êì íìë íì ìëëì ëì"
-"íì ììì ììíê ëììì ëêíëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
+msgid "Permanently remove this folder"
+msgstr "ì íëë ììí ìêíëë"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "ìëëìì ëê ëê"
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
+msgid "E_xpunge"
+msgstr "ììí ìì(_X)"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid "Insufficient Permissions"
-msgstr "êíì ììëë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "ì íëì ììí ëë ëììë ììí ìêíëë"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-msgid "The selected folder is not writable."
-msgstr "ìíí íëë ìê ìììëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
+msgid "Mar_k All Messages as Read"
+msgstr "ëë ëììë ìì êìë íì(_K)"
 
-#: ../plugins/bbdb/bbdb.c:668 ../plugins/bbdb/bbdb.c:677
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic Contacts"
-msgstr "ìë ìëì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1284
+msgid "Mark all messages in the folder as read"
+msgstr "íëì ëë ëììë ìì êìë íìíëë"
 
-#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:692
-msgid "Create _address book entries when sending mails"
-msgstr "ëìì ëë ë ììëì íë ëëê(_A)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
+msgid "_Move Folder To..."
+msgstr "íë ìêê(_M)..."
 
-#: ../plugins/bbdb/bbdb.c:700
-msgid "Select Address book for Automatic Contacts"
-msgstr "ìë ìëìë ììí ììëì ìííììì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
+msgid "Move the selected folder into another folder"
+msgstr "ìíí íëë ëë íëë ìêëë"
 
-#: ../plugins/bbdb/bbdb.c:717
-msgid "Instant Messaging Contacts"
-msgstr "ììíì ëìì ìëì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
+msgid "_New..."
+msgstr "ìë ëëê(_N)..."
 
-#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:732
-msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr "íì ìê ëëì ìëì ìë ë êëì ëêí(_S)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
+msgid "Create a new folder for storing mail"
+msgstr "ëìì ììíë ì íëë ëëëë"
 
-#: ../plugins/bbdb/bbdb.c:740
-msgid "Select Address book for Pidgin buddy list"
-msgstr "íì ìê ëëì ììí ììëì ìííììì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
+msgid "Change the properties of this folder"
+msgstr "ì íëì ììì ëêëë"
 
-#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:753
-msgid "Synchronize with _buddy list now"
-msgstr "ìê ìê ëëê ëêí(_B)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
+msgid "Refresh the folder"
+msgstr "íëë ìë êì"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid "BBDB"
-msgstr "BBDB"
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
+msgid "Change the name of this folder"
+msgstr "ì íëì ìëì ëêëë"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid ""
-"Takes the gruntwork out of managing your address book.\n"
-"\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
-msgstr ""
-"ììë êë ëì ììì ìííëë.\n"
-"\n"
-"ëììì íìí ëëë ìëìë ìëê ììëì ììë ììëì ëìëë. ë "
-"ìê ëëìì ììíì ëìì ìëì ìëë ìì ëìëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
+msgid "Select Message _Thread"
+msgstr "ëìì êíë ìí(_T)"
 
-#: ../plugins/caldav/caldav-browse-server.c:215
-msgid "Authentication failed. Server requires correct login."
-msgstr "ìì ìí. ì ìëë ëêìì íì íëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1326
+msgid "Select all messages in the same thread as the selected message"
+msgstr "ìíí ëììì êì êíëì ëë ëììë ìííëë"
 
-#: ../plugins/caldav/caldav-browse-server.c:217
-msgid "Given URL cannot be found."
-msgstr "íë URLì ìì ì ììëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
+msgid "Select Message S_ubthread"
+msgstr "ëìì ìë êíë ìí(_U)"
 
-#: ../plugins/caldav/caldav-browse-server.c:221
-#, c-format
-msgid ""
-"Server returned unexpected data.\n"
-"%d - %s"
-msgstr ""
-"ìëìì ììì ëí ëìíë ëííìëë.\n"
-"%d - %s"
+#: ../modules/mail/e-mail-shell-view-actions.c:1333
+msgid "Select all replies to the currently selected message"
+msgstr "íì ìíí ëììì íìì ëë ìííëë"
 
-#: ../plugins/caldav/caldav-browse-server.c:361
-#: ../plugins/caldav/caldav-browse-server.c:695
-msgid "Failed to parse server response."
-msgstr "ìë ìëì ëìíëë ìííìëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
+msgid "Empty _Trash"
+msgstr "ìì ëìì ëìê(_T)"
 
-#: ../plugins/caldav/caldav-browse-server.c:455
-msgid "Events"
-msgstr "íì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "ëë íëì ììí ëììë ììí ìêíëë"
 
-#: ../plugins/caldav/caldav-browse-server.c:477
-msgid "User's calendars"
-msgstr "ìììì ëë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
+msgid "_New Label"
+msgstr "ì ëìë(_N)"
 
-#: ../plugins/caldav/caldav-browse-server.c:589
-#: ../plugins/caldav/caldav-browse-server.c:764
-msgid "Failed to get server URL."
-msgstr "ìë URLì ëëë ìííìëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1361
+msgid "N_one"
+msgstr "ìì(_O)"
 
-#: ../plugins/caldav/caldav-browse-server.c:762
-#: ../plugins/caldav/caldav-browse-server.c:803
-#: ../plugins/caldav/caldav-browse-server.c:1502
-msgid "Searching for user's calendars..."
-msgstr "ììì ëëì ìë ììëë..."
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
+msgid "_Manage Subscriptions"
+msgstr "êë êë(_M)"
 
-#: ../plugins/caldav/caldav-browse-server.c:801
-msgid "Could not find any user calendar."
-msgstr "ììì ëëì íëë ìì ì ììëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1454
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "ìê ìëì íëë êë/êëíì íëë"
 
-#: ../plugins/caldav/caldav-browse-server.c:939
-#, c-format
-msgid "Previous attempt failed: %s"
-msgstr "ìì ìëê ìííìëë: %s"
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1403
+msgid "Send / _Receive"
+msgstr "ëëê ëê(_R)"
 
-#: ../plugins/caldav/caldav-browse-server.c:941
-#, c-format
-msgid "Previous attempt failed with code %d"
-msgstr "ìì ìëê ìë ìë %dëìë ìííìëë"
+# tooltip
+#: ../modules/mail/e-mail-shell-view-actions.c:1384
+msgid "Send queued items and retrieve new items"
+msgstr "ëë ëìì ëëê ì ëìì ëìëë"
 
-#: ../plugins/caldav/caldav-browse-server.c:946
-#, c-format
-msgid "Enter password for user %s on server %s"
-msgstr "ììì %sì (%s ìë) ìíë ìëíììì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
+msgid "R_eceive All"
+msgstr "ëë ëê(_E)"
 
-#: ../plugins/caldav/caldav-browse-server.c:1009
-#, c-format
-msgid "Cannot create soup message for URL '%s'"
-msgstr "URL '%s'ì ëë SOUP ëììë ëë ì ììëë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
+msgid "Receive new items from all accounts"
+msgstr "ëë êìì íëì ëìëë"
 
-#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1267
-msgid "Searching folder content..."
-msgstr "íë ëìì êìíë ììëë..."
+#: ../modules/mail/e-mail-shell-view-actions.c:1396
+msgid "_Send All"
+msgstr "ëë ëëê(_S)"
 
-#: ../plugins/caldav/caldav-browse-server.c:1326
-#: ../plugins/caldav/caldav-source.c:262
-msgid "Server _handles meeting invitations"
-msgstr "ìëìì ëì ìëë ìë(_H)"
+# tooltip
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
+msgid "Send queued items in all accounts"
+msgstr "ëë êìì ëë íëì ëëëë"
 
-#: ../plugins/caldav/caldav-browse-server.c:1333
-msgid "List of available calendars:"
-msgstr "ìì êëí ëë ëë:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1424
+#: ../widgets/misc/e-activity-proxy.c:313
+msgid "Cancel"
+msgstr "ìì"
 
-# FIXME: ëì ìëìì íì íì
-#: ../plugins/caldav/caldav-browse-server.c:1371
-msgid "Supports"
-msgstr "ìì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1426
+msgid "Cancel the current mail operation"
+msgstr "íì ëì ëìì ììíëë"
 
-#: ../plugins/caldav/caldav-browse-server.c:1402
-#: ../plugins/caldav/caldav-source.c:260
-msgid "User e_mail:"
-msgstr "ììì ììëì(_M):"
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
+msgid "Collapse All _Threads"
+msgstr "ëë êíë ìê(_T)"
 
-#: ../plugins/caldav/caldav-browse-server.c:1478
-#, c-format
-msgid "Failed to create thread: %s"
-msgstr "ìëëë ëëëë ìííìëë: %s"
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
+msgid "Collapse all message threads"
+msgstr "ëë ëìì êíëë ììëë"
 
-#: ../plugins/caldav/caldav-browse-server.c:1599
-#, c-format
-msgid "Server URL '%s' is not a valid URL"
-msgstr "ìë URL '%s'ì(ë) ìëë URLì ìëëë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
+msgid "E_xpand All Threads"
+msgstr "ëë êíë íìê(_X)"
 
-#: ../plugins/caldav/caldav-browse-server.c:1609
-msgid "Browse for a CalDAV calendar"
-msgstr "CalDAV ëë ììëê"
+#: ../modules/mail/e-mail-shell-view-actions.c:1440
+msgid "Expand all message threads"
+msgstr "ëë ëìì êíëì ìì ëììë ëìëë."
 
-#: ../plugins/caldav/caldav-source.c:241
-#: ../plugins/calendar-http/calendar-http.c:109
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:261
-msgid "_URL:"
-msgstr "_URL:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
+msgid "_Message Filters"
+msgstr "ëìì íí(_M)"
 
-#: ../plugins/caldav/caldav-source.c:248
-#: ../plugins/calendar-http/calendar-http.c:149
-#: ../plugins/google-account-setup/google-contacts-source.c:359
-msgid "Use _secure connection"
-msgstr "ëì ìê ìì(_S)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1447
+msgid "Create or edit rules for filtering new mail"
+msgstr "ì ëì íí êìì ëëêë íìíëë"
 
-#: ../plugins/caldav/caldav-source.c:265
-msgid "Brows_e server for a calendar"
-msgstr "ìëìì ëë ììëê(_E)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
+msgid "_Subscriptions..."
+msgstr "êë(_S)..."
 
-#: ../plugins/caldav/caldav-source.c:283
-#: ../plugins/calendar-file/calendar-file.c:207
-#: ../plugins/calendar-http/calendar-http.c:132
-#: ../plugins/calendar-weather/calendar-weather.c:421
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:661
-msgid "Re_fresh:"
-msgstr "ìë êì(_F):"
+#: ../modules/mail/e-mail-shell-view-actions.c:1461
+msgid "F_older"
+msgstr "íë(_O)"
 
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Support"
-msgstr "CalDAV êë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1468
+msgid "_Label"
+msgstr "ëìë(_L)"
 
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "Add CalDAV support to Evolution."
-msgstr "CalDAV êëì ìëëìì ìêíëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
+msgid "C_reate Search Folder From Search..."
+msgstr "êìí êêë êì íë ëëê(_R)..."
 
-#: ../plugins/calendar-file/calendar-file.c:136
-msgid "C_ustomize options"
-msgstr "ììì ìì ìì(_U)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
+msgid "Search F_olders"
+msgstr "êì íë(_O)"
 
-#: ../plugins/calendar-file/calendar-file.c:155
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
-msgid "F_ilename:"
-msgstr "íì ìë(_I):"
+#: ../modules/mail/e-mail-shell-view-actions.c:1494
+msgid "Create or edit search folder definitions"
+msgstr "êì íë ììë ëëêë íìíëë"
 
-#: ../plugins/calendar-file/calendar-file.c:160
-msgid "Choose calendar file"
-msgstr "ëë íìì ìííììì"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:213
-msgid "On open"
-msgstr "ì ë"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:215
-msgid "On file change"
-msgstr "íì ëêë ë"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:217
-msgid "Periodically"
-msgstr "ìêììë"
-
-#: ../plugins/calendar-file/calendar-file.c:238
-msgid "Force read _only"
-msgstr "ìê ìì êì(_O)"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "ëì ëë"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Add local calendars to Evolution."
-msgstr "ëì ëëì ìëëìì ìêíëë."
-
-#: ../plugins/calendar-http/calendar-http.c:214
-msgid "Userna_me:"
-msgstr "ììììë(_M):"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Web Calendars"
-msgstr "ì ëë"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Add web calendars to Evolution."
-msgstr "ì ëëì ìëëìì ìêíëë."
-
-#: ../plugins/calendar-weather/calendar-weather.c:65
-msgid "Weather: Fog"
-msgstr "ëì: ìê"
-
-#: ../plugins/calendar-weather/calendar-weather.c:66
-msgid "Weather: Cloudy"
-msgstr "ëì: êë"
-
-#: ../plugins/calendar-weather/calendar-weather.c:67
-msgid "Weather: Cloudy Night"
-msgstr "ëì: ëíë êë"
-
-#: ../plugins/calendar-weather/calendar-weather.c:68
-msgid "Weather: Overcast"
-msgstr "ëì: íë"
-
-#: ../plugins/calendar-weather/calendar-weather.c:69
-msgid "Weather: Showers"
-msgstr "ëì: ìëê"
-
-#: ../plugins/calendar-weather/calendar-weather.c:70
-msgid "Weather: Snow"
-msgstr "ëì: ë"
-
-#: ../plugins/calendar-weather/calendar-weather.c:71
-msgid "Weather: Sunny"
-msgstr "ëì: ëì"
-
-#: ../plugins/calendar-weather/calendar-weather.c:72
-msgid "Weather: Clear Night"
-msgstr "ëì: ëíë ëì"
-
-#: ../plugins/calendar-weather/calendar-weather.c:73
-msgid "Weather: Thunderstorms"
-msgstr "ëì: íí"
-
-#: ../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:350
-#: ../plugins/calendar-weather/calendar-weather.c:398
-msgctxt "weather-cal-location"
-msgid "None"
-msgstr "ìì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
+msgid "_New Folder..."
+msgstr "ì íë(_N)..."
 
-#: ../plugins/calendar-weather/calendar-weather.c:477
-msgid "_Units:"
-msgstr "ëì(_U):"
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
+msgid "Show Message _Preview"
+msgstr "ëìì ëëëê ëìê(_P)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:486
-msgid "Metric (Celsius, cm, etc)"
-msgstr "ëíë (ìì, ìíëí ë)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1559
+msgid "Show message preview pane"
+msgstr "ëìì ëê ìì íìíëë"
 
-#: ../plugins/calendar-weather/calendar-weather.c:489
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "ìíëì ëì (íì, ìì ë)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
+msgid "Show _Deleted Messages"
+msgstr "ììí ëìì ëìê(_D)"
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Weather Calendars"
-msgstr "ëì ëë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
+msgid "Show deleted messages with a line through them"
+msgstr "ììí ëììë ìì êì íìíëë"
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-msgid "Add weather calendars to Evolution."
-msgstr "ëì ëëì ìëëìì ìêíëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
+msgid "_Group By Threads"
+msgstr "êíëë ëì(_G)"
 
-#: ../plugins/dbx-import/dbx-importer.c:292
-msgid "Importing Outlook Express data"
-msgstr "ììë ììíëì ëìí êììê"
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
+msgid "Threaded message list"
+msgstr "ìêë ëìì ëë"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
-msgid "Outlook DBX import"
-msgstr "ììë DBX êììê"
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
+msgid "_Unmatched Folder Enabled"
+msgstr "íë ìì íë ìì(_U)"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
-msgid "Outlook Express 5/6 personal folders (.dbx)"
-msgstr "ììë ììíëì 5/6 êì íë (.dbx)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
+msgid "Toggles whether Unmatched search folder is enabled"
+msgstr "íë ìì êì íëë ììíì ìëë íêíëë"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
-msgid "Import Outlook Express messages from DBX file"
-msgstr "DBX íìì ììë ììíëì ëììë êììëë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
+msgid "Show message preview below the message list"
+msgstr "ëìì ëë ìëì ëìì ëë ëêë íìíëë"
 
-#: ../plugins/default-source/default-source.c:169
-msgid "Mark as _default address book"
-msgstr "êë ììëìë íì(_D)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
+msgid "Show message preview alongside the message list"
+msgstr "ëìì ëëê ëëí ëìì ëë ëêë íìíëë"
 
-#: ../plugins/default-source/default-source.c:183
-msgid "A_utocomplete with this address book"
-msgstr "ì ììëìë ìë ìì(_U)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1618
+msgid "All Messages"
+msgstr "ëë ëìì"
 
-#: ../plugins/default-source/default-source.c:192
-msgid "Mark as _default calendar"
-msgstr "êë ëëìë íì(_D)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1625
+msgid "Important Messages"
+msgstr "ììí ëìì"
 
-#: ../plugins/default-source/default-source.c:193
-msgid "Mark as _default task list"
-msgstr "êë ìì ëëìë íì(_D)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1632
+msgid "Last 5 Days' Messages"
+msgstr "ìê 5ìê ëìì"
 
-#: ../plugins/default-source/default-source.c:194
-msgid "Mark as _default memo list"
-msgstr "êë ëë ëëìë íì(_D)"
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
+msgid "Messages Not Junk"
+msgstr "ìíëì ìë ëìì"
 
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
-msgid "Default Sources"
-msgstr "êë ìì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
+msgid "Messages with Attachments"
+msgstr "ìëê ìë ëìì"
 
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Mark your preferred address book and calendar as default."
-msgstr "ìíë ììë ë ëëì êëìë íìíëë."
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
+msgid "No Label"
+msgstr "ëìë ìì"
 
-# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
-#: ../plugins/email-custom-header/email-custom-header.c:301
-msgctxt "email-custom-header-Security"
-msgid "Security:"
-msgstr "ëì:"
+#: ../modules/mail/e-mail-shell-view-actions.c:1660
+msgid "Read Messages"
+msgstr "ìì ëìì"
 
-# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
-#: ../plugins/email-custom-header/email-custom-header.c:305
-msgctxt "email-custom-header-Security"
-msgid "Personal"
-msgstr "êì"
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
+msgid "Unread Messages"
+msgstr "ìì ìì ëìì"
 
-# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
-#: ../plugins/email-custom-header/email-custom-header.c:306
-msgctxt "email-custom-header-Security"
-msgid "Unclassified"
-msgstr "ëëìë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
+msgid "Subject or Addresses contain"
+msgstr "ìëìë ììì íí"
 
-# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
-#: ../plugins/email-custom-header/email-custom-header.c:307
-msgctxt "email-custom-header-Security"
-msgid "Protected"
-msgstr "ëí"
+#: ../modules/mail/e-mail-shell-view-actions.c:1729
+msgid "All Accounts"
+msgstr "ëë êì"
 
-# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
-#: ../plugins/email-custom-header/email-custom-header.c:308
-msgctxt "email-custom-header-Security"
-msgid "Confidential"
-msgstr "ìí"
+#: ../modules/mail/e-mail-shell-view-actions.c:1736
+msgid "Current Account"
+msgstr "íì êì"
 
-# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
-#: ../plugins/email-custom-header/email-custom-header.c:309
-msgctxt "email-custom-header-Security"
-msgid "Secret"
-msgstr "ëë"
+#: ../modules/mail/e-mail-shell-view-actions.c:1743
+msgid "Current Folder"
+msgstr "íì íë"
 
-# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
-#: ../plugins/email-custom-header/email-custom-header.c:310
-msgctxt "email-custom-header-Security"
-msgid "Top secret"
-msgstr "ìêëë"
+#: ../modules/mail/e-mail-shell-view.c:613
+msgid "All Account Search"
+msgstr "ëë êì êì"
 
-#: ../plugins/email-custom-header/email-custom-header.c:367
-msgctxt "email-custom-header"
-msgid "None"
-msgstr "ìì"
+#: ../modules/mail/e-mail-shell-view.c:710
+msgid "Account Search"
+msgstr "êì êì"
 
-#: ../plugins/email-custom-header/email-custom-header.c:540
-msgid "_Custom Header"
-msgstr "ììì ìì íë(_C)"
+#: ../modules/mail/e-mail-shell-view.c:973
+msgid "Proxy _Logout"
+msgstr "íëì ëêìì(_L)"
 
-#. 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:803
-msgid ""
-"The format for specifying a Custom Header key value is:\n"
-"Name of the Custom Header key values separated by \";\"."
-msgstr ""
-"ììì ìì íë êì ììíë íìì:\n"
-"ììì ìì íëì íì êì \";\"ìë êëíëë."
+#: ../modules/mail/e-mail-shell-view-private.c:962
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%dê ìí, "
 
-#: ../plugins/email-custom-header/email-custom-header.c:857
-msgid "Key"
-msgstr "í"
+#: ../modules/mail/e-mail-shell-view-private.c:973
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%dê ìì"
 
-#: ../plugins/email-custom-header/email-custom-header.c:873
-#: ../plugins/templates/templates.c:470
-msgid "Values"
-msgstr "ê"
+#: ../modules/mail/e-mail-shell-view-private.c:979
+#: ../modules/mail/e-mail-shell-view-private.c:986
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%dê ìí"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
-msgid "Custom Header"
-msgstr "ììì ìì íë"
+#: ../modules/mail/e-mail-shell-view-private.c:992
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%dê ìì"
 
-#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Add custom headers to outgoing mail messages."
-msgstr "ëëë ëììì ììì ìì íëë ìêíëë."
+#: ../modules/mail/e-mail-shell-view-private.c:998
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%dê ì ëë"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
-msgid "Email Custom Header"
-msgstr "ììëì ììì ìì íë"
+#: ../modules/mail/e-mail-shell-view-private.c:1004
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%dê ëë"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "Automatically launch editor when key is pressed in the mail composer"
-msgstr "ëì ìì ììì íë ëëë ìëìë íìê ìí"
+#: ../modules/mail/e-mail-shell-view-private.c:1016
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%dê ì ìì, "
 
-#: ../plugins/external-editor/external-editor.c:114
-msgid "Command to be executed to launch the editor: "
-msgstr "íìêë ìíí ëëì: "
+#: ../modules/mail/e-mail-shell-view-private.c:1019
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "ìì %dê"
 
-#: ../plugins/external-editor/external-editor.c:115
-msgid ""
-"For XEmacs use \"xemacs\"\n"
-"For Vim use \"gvim -f\""
-msgstr ""
-"ìììëìì êì \"xemacs\"ë ììíê\n"
-"Vimì \"gvim -f\"ë ììíììì"
+#: ../modules/mail/e-mail-shell-view-private.c:1042
+msgid "Trash"
+msgstr "ìì ëìì"
 
-#: ../plugins/external-editor/external-editor.c:396
-#: ../plugins/external-editor/external-editor.c:398
-msgid "Compose in External Editor"
-msgstr "ìë íìêìì ìì"
+#: ../modules/mail/e-mail-shell-view-private.c:1458
+msgid "Send / Receive"
+msgstr "ëëê / ëê"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid "External Editor"
-msgstr "ìë íìê"
+#: ../modules/mail/em-composer-prefs.c:509
+msgid "Language(s)"
+msgstr "ìì"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
-msgid "Use an external editor to compose plain-text mail messages."
-msgstr "ìë íìí ëì ëììë ììí ë ìë íìêë ììíëë."
+#: ../modules/mail/em-mailer-prefs.c:86
+msgid "Every time"
+msgstr "íì"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
-msgid "Editor not launchable"
-msgstr "íìêë ììí ì ììëë"
+#: ../modules/mail/em-mailer-prefs.c:87
+msgid "Once per day"
+msgstr "ëì"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"íëêì êë ìììì ììí ìë íìêë ìíí ì ììëë. ëë íìê"
-"ë ììí ëììì."
+#: ../modules/mail/em-mailer-prefs.c:88
+msgid "Once per week"
+msgstr "ëì"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
-msgid "Cannot create Temporary File"
-msgstr "ìì íìì ëë ì ììëë"
+#: ../modules/mail/em-mailer-prefs.c:89
+msgid "Once per month"
+msgstr "ëë"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
-msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
-msgstr "ëìì ììí ìì íìì ëë ì ììëë. ëìì ëì ìëíììì."
+#: ../modules/mail/em-mailer-prefs.c:318
+msgid "Header"
+msgstr "íë"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid "External editor still running"
-msgstr "ìë íìêê ìì ìí ììëë"
+#: ../modules/mail/em-mailer-prefs.c:322
+msgid "Contains Value"
+msgstr "ê íí"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor is still running. The mail composer window cannot be "
-"closed as long as the editor is active."
-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:1145
+msgid "_Date header:"
+msgstr "ëì íë(_D):"
 
-#: ../plugins/face/face.c:292
-msgid "Select a Face Picture"
-msgstr "ìê ììì êëììì"
+#: ../modules/mail/em-mailer-prefs.c:1146
+msgid "Show _original header value"
+msgstr "ìë íë ê íì(_O)"
 
-#: ../plugins/face/face.c:302
-msgid "Image files"
-msgstr "êë íì"
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "Do you want to make Evolution your default email client?"
+msgstr "ìëëìì êë ììëì íëêëìë íìêìëê?"
 
-#: ../plugins/face/face.c:361
-msgid "_Insert Face picture by default"
-msgstr "êëêìë ìê ìì ëê(_I)"
+#. Translators: First %s is an email address, second %s
+#. * is the subject of the email, third %s is the date.
+#: ../modules/mdn/evolution-mdn.c:323
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr "%sìê ëë \"%s\"ì êí(ëë ë %s) ëììë ìììëë."
 
-#: ../plugins/face/face.c:374
-msgid "Load new _Face picture"
-msgstr "ì ìê ìì ììëìê(_F)"
+#. Translators: %s is the subject of the email message.
+#: ../modules/mdn/evolution-mdn.c:390
+#, c-format
+msgid "Delivery Notification for \"%s\""
+msgstr "ëì ëìì ëí ëë íì: \"%s\""
 
-#: ../plugins/face/face.c:435
-msgid "Include _Face"
-msgstr "ìê ìì íí(_F)"
+#: ../modules/mdn/evolution-mdn.c:543
+#, c-format
+msgid "Send a read receipt to '%s'"
+msgstr "ëìì ëìì ìì íì ëëê: '%s'"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Attach a small picture of your face to outgoing messages."
-msgstr "ëëë ëììì ìì ìê ììì ìëíëë."
+#. name doesn't matter
+#: ../modules/mdn/evolution-mdn.c:548
+msgid "_Notify Sender"
+msgstr "ëë íì ëëê(_N)"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:1
-msgid "Failed Read"
-msgstr "ìê ìí"
+#: ../modules/mdn/evolution-mdn.error.xml.h:1
+msgid "Sender wants to be notified when you have read this message."
+msgstr "ì ëììë ììëì ëë ìëì íìì ëê ìì íëë."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:2
-msgid "The file cannot be read"
-msgstr "íë íìì ìì ì ììëë"
+#: ../modules/mdn/evolution-mdn.error.xml.h:2
+msgid "Sender has been notified that you have read this message."
+msgstr "ì ëììë ììì ë ëë ìëì íìì ëììëë."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:3
-msgid "Invalid Image Size"
-msgstr "êë íêê ìëëììëë"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Evolution is currently offline."
+msgstr "ìëëìì íì ìê ìì ìíìëë."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "48 x 48 íêì êë íìì ìííììì"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+msgid "Click 'Work Online' to return to online mode."
+msgstr "ìê ëëë ëìêëë 'ìê ìí ìì'ì ëëììì."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "Not an image"
-msgstr "êëì ìëëë"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+msgid "Evolution is currently offline due to a network outage."
+msgstr "ëíìí ìêì ëìì ìëëìì íì ìê ìì ìíìëë."
 
-#: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
-msgstr "ìíí íìì ìëë PNG êë íìì ìëëë. ìë: {0}"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr "ëíìíê ìêëë ìëëìì ìê ìíë ëëìêëë."
 
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:249
-msgid "Server"
-msgstr "ìë"
+#: ../modules/online-accounts/camel-sasl-xoauth.c:417
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+"ìì ííì ìì org.gnome.OnlineAccounts ìëìì êìì ìì ì ììëë."
 
-#: ../plugins/google-account-setup/google-source.c:452
-#, c-format
-msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "êëíê ìë ëë ëëì ììëë %s ìììì ìíë ìëíììì."
+#: ../modules/online-accounts/camel-sasl-xoauth.c:504
+msgid "OAuth"
+msgstr "OAuth"
 
-#: ../plugins/google-account-setup/google-source.c:564
-#, c-format
+#: ../modules/online-accounts/camel-sasl-xoauth.c:506
 msgid ""
-"Cannot read data from Google server.\n"
-"%s"
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
 msgstr ""
-"êê ìëìì ëìíë ìì ì ììëë.\n"
-"%s"
+"ì ììì êë ìëì êì ìëìì ìêíë ëëìë ìëì ìêíëë"
 
-#: ../plugins/google-account-setup/google-source.c:564
-#: ../plugins/mail-to-task/mail-to-task.c:840
-#: ../plugins/mail-to-task/mail-to-task.c:1103
-msgid "Unknown error."
-msgstr "ì ì ìë ìë."
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+msgid "Author(s)"
+msgstr "êëì"
 
-#: ../plugins/google-account-setup/google-source.c:665
-msgid "Cal_endar:"
-msgstr "ëë(_E):"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:255
+msgid "Plugin Manager"
+msgstr "íëêì êëì"
 
-#: ../plugins/google-account-setup/google-source.c:702
-msgid "Retrieve _List"
-msgstr "ëë êììê(_L)"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:270
+msgid "Note: Some changes will not take effect until restart"
+msgstr "ìì: ìë ëë ìíì ëì ììíì ììëëë"
 
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Google Calendars"
-msgstr "êê ëë"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:299
+msgid "Overview"
+msgstr "êì"
 
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Add Google Calendars to Evolution."
-msgstr "êê ëëì ìëëìì ìêíëë."
+#: ../modules/plugin-manager/evolution-plugin-manager.c:368
+#: ../modules/plugin-manager/evolution-plugin-manager.c:451
+msgid "Plugin"
+msgstr "íëêì"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "ëì êë"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+msgid "_Plugins"
+msgstr "íëêì(_P)"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "êëì ëì ëìììì ìì íìíëë."
+# ëë ìë, ëììë ëì
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+msgid "Enable and disable plugins"
+msgstr "íëêìì ììíêë íìíëë"
 
-#: ../plugins/imap-features/imap-headers.c:334
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "Custom Headers"
-msgstr "ììì ìì íë"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+msgid "Display plain text version"
+msgstr "ìë íìí ëì íì"
 
-#: ../plugins/imap-features/imap-headers.c:356
-#: ../plugins/imap-features/imap-headers.ui.h:7
-msgid "IMAP Headers"
-msgstr "IMAP íë"
+# tooltip
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+msgid "Display plain text version of multipart/alternative message"
+msgstr "multipart/alternative ëììì ìë íìí ëìì íìíëë"
 
-#: ../plugins/imap-features/imap-headers.ui.h:1
-msgid ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
-msgstr ""
-"IMAP íë ììì ìííììì.\n"
-"íëë ëì ìíí ìë ëìëëíëë ë ìë êëëë."
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+msgid "Display HTML version"
+msgstr "HTML ëì íì"
 
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid "_Fetch All Headers"
-msgstr "íë ëë êììê(_F)"
+# tooltip
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
+msgid "Display HTML version of multipart/alternative message"
+msgstr "multipart/alternative ëììì HTML ëìì íìíëë"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:46
+msgid "Show HTML if present"
+msgstr "HTMLì ììë íì"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:47
+msgid "Let Evolution choose the best part to show."
+msgstr "ìëëììì ììì ëê ìì ëëì íì."
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/plugin/config-ui.c:50
+msgid "Show plain text if present"
+msgstr "ìë íìíê ììë íì"
 
-#: ../plugins/imap-features/imap-headers.ui.h:4
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:51
 msgid ""
-"_Basic Headers (Fastest) \n"
-"Use this if you do not have filters based on mailing lists"
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
 msgstr ""
-"êë íë(_B) (êì ëë) \n"
-"ëìë ëìí êë ííê ììë ì ììì ììíììì"
+"ìë íìíê ììë íìíê, ìë íìíê ììë ìëëììì ëìì ëë"
+"ì êë ìëë."
 
-#: ../plugins/imap-features/imap-headers.ui.h:6
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "êë ë ëìë ëìí íë (êëê)(_M)"
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:91
+#: ../modules/prefer-plain/plugin/config-ui.c:55
+msgid "Only ever show plain text"
+msgstr "ìë íìíë íì"
 
-#: ../plugins/imap-features/imap-headers.ui.h:8
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:92
+#: ../modules/prefer-plain/plugin/config-ui.c:56
 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\"."
+"Always show plain text part and make attachments from other parts, if "
+"requested."
 msgstr ""
-"ìì íì íëì êì ìêë ëì ì íëë ìëíììì.\n"
-"\"ëë íë\"ë ìííë ì ìíì ëìíììì."
+"íì ìë íìí ëëë íìíê, ëë ëëì íìíë ìë íìë ëëëë."
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "IMAP Features"
-msgstr "IMAP êë"
+#: ../modules/prefer-plain/plugin/config-ui.c:107
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "HTML ëëì ìêê ìëë íì(_U)"
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
-msgid "Fine-tune your IMAP accounts."
-msgstr "IMAP êìì ìë ìíì ììíëë."
+#: ../modules/prefer-plain/plugin/config-ui.c:129
+msgid "HTML _Mode"
+msgstr "HTML ëë(_M)"
 
-#. Translators: The first '%s' is replaced with a calendar name,
-#. * the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:505
-#, c-format
-msgid "Failed to load the calendar '%s' (%s)"
-msgstr "'%s' ëëì ììëìëë ìííìëë (%s)"
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "ìë íìí ìí"
 
-# event -> íì, Microsoft Office XP ìê
-#: ../plugins/itip-formatter/itip-formatter.c:665
+#. but then we also need to create our own section frame
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Plain Text Mode"
+msgstr "ìë íìí ëë"
+
+#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "ëì ëììì HTMLì ìëëë ìë íìíë ëëë."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:192
 #, c-format
-msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr "'%s' ëëì ëì ìë ììì ì ëìê ìëíëë"
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "ìíìììì ììíëë ìííìëë (%s): "
 
-#: ../plugins/itip-formatter/itip-formatter.c:689
+#: ../modules/spamassassin/evolution-spamassassin.c:215
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "ëì ëìì ëìì ìíìììì ìëíëë ìííìëë: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:234
 #, c-format
-msgid "Found the appointment in the calendar '%s'"
-msgstr "'%s' ëëì ììì ëêíìëë"
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "ìíìììì '%s' ëìíë ìëë ìííìëë: "
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
-msgid "Unable to find any calendars"
-msgstr "ëëì íëë ìì ì ììëë"
+#: ../modules/spamassassin/evolution-spamassassin.c:262
+msgid "Failed to read output from SpamAssassin: "
+msgstr "ìíììììì ìëì ìëë ìííìëë: "
 
-#: ../plugins/itip-formatter/itip-formatter.c:809
-msgid "Unable to find this meeting in any calendar"
-msgstr "ìë ëëììë ì ëìì ìì ì ììëë"
+#: ../modules/spamassassin/evolution-spamassassin.c:317
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr "ìíìììì ìì ìëíêë ëì ëììë ìëíëë ìííìëë"
 
-#: ../plugins/itip-formatter/itip-formatter.c:813
-msgid "Unable to find this task in any task list"
-msgstr "ìë ìì ëëììë ì ììì ìì ì ììëë"
+#: ../modules/spamassassin/evolution-spamassassin.c:885
+msgid "SpamAssassin Options"
+msgstr "ìíììì ìì"
 
-#: ../plugins/itip-formatter/itip-formatter.c:817
-msgid "Unable to find this memo in any memo list"
-msgstr "ìë ëë ëëììë ì ëëë ìì ì ììëë"
+#: ../modules/spamassassin/evolution-spamassassin.c:900
+msgid "I_nclude remote tests"
+msgstr "ìê íìí íí(_N)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
-msgid "Opening the calendar. Please wait..."
-msgstr "ëëì ìë ììëë. ìì êëëììì..."
+#: ../modules/spamassassin/evolution-spamassassin.c:914
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "ìëê íë ìíìììì ë ììììë ìëíìë, ë ëëëë."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1122
-msgid "Searching for an existing version of this appointment"
-msgstr "ì ììì íì ëìì ìë ììëë"
+#: ../modules/spamassassin/evolution-spamassassin.c:1123
+msgid "SpamAssassin"
+msgstr "ìíììì"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1484
-#, c-format
-msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "íëì '%s' ëëì ëë ì ììëë.  %s"
+#: ../modules/startup-wizard/e-mail-config-import-page.c:204
+#: ../widgets/misc/e-import-assistant.c:403
+msgid "Please select the information that you would like to import:"
+msgstr "ëììì êììê ìì ìëë ìííììì:"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1498
+#: ../modules/startup-wizard/e-mail-config-import-page.c:233
+#: ../widgets/misc/e-import-assistant.c:559
 #, c-format
-msgid "Sent to calendar '%s' as accepted"
-msgstr "'%s' ëëì ìëìëê ëë"
+msgid "From %s:"
+msgstr "%sìì:"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1502
-#, c-format
-msgid "Sent to calendar '%s' as tentative"
-msgstr "'%s' ëëì ëììëê ëë"
+# ìì tab, ìí íìê ìë
+#. Keep the title identical to EMailConfigImportPage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/startup-wizard/e-mail-config-import-page.c:264
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
+msgid "Importing Files"
+msgstr "íì êììê"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1507
-#, c-format
-msgid "Sent to calendar '%s' as declined"
-msgstr "'%s' ëëì êììëê ëë"
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+msgid "Import cancelled."
+msgstr "êììê ììí."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1512
-#, c-format
-msgid "Sent to calendar '%s' as canceled"
-msgstr "'%s' ëëì ììëê ëë"
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+msgid "Import complete."
+msgstr "êììê ëì."
+
+#: ../modules/startup-wizard/e-startup-assistant.c:154
+msgid ""
+"Welcome to Evolution.\n"
+"\n"
+"The next few screens will allow Evolution to connect to your email accounts, "
+"and to import files from other applications."
+msgstr ""
+"ìëëìì ììíê ëì êì íìíëë.\n"
+"\n"
+"ëìì ì ë êì íëìì ìëëììë ììëì êìì ìêíëë ììíê, ëë íëêëìì ìë íìëì êììê ëëë."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:242
+msgid "Loading accounts..."
+msgstr "êì ììëìë ì..."
+
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+msgid "_Format as..."
+msgstr "ììí íììë íì(_F)..."
+
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+msgid "_Other languages"
+msgstr "ëë ìì(_O)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1581
-#: ../plugins/itip-formatter/itip-formatter.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:2065
-msgid "Saving changes to the calendar. Please wait..."
-msgstr "ëë ìíì ëëì ììíë ììëë. ìì êëëììì..."
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:342
+msgid "Text Highlight"
+msgstr "íìí êì"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1620
-msgid "Unable to parse item"
-msgstr "íëì íìí ì ììëë"
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:348
+msgid "Syntax highlighting of mail parts"
+msgstr "ëì ëëì íìí êì"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#, c-format
-msgid "Organizer has removed the delegate %s "
-msgstr "ìììê ëëì %sì(ë) ìììëë"
+#: ../modules/text-highlight/languages.c:32
+msgid "_Plain text"
+msgstr "ìë íìí(_P)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1807
-msgid "Sent a cancelation notice to the delegate"
-msgstr "ëëììê ìì êìë ëëìëë"
+#: ../modules/text-highlight/languages.c:38
+msgid "_Assembler"
+msgstr "ììëë(_A)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1809
-msgid "Could not send the cancelation notice to the delegate"
-msgstr "ëëììê ìì êìë ëë ì ììëë"
+#: ../modules/text-highlight/languages.c:43
+msgid "_Bash"
+msgstr "_Bash"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1855
-#, c-format
-msgid "Unable to update attendee. %s"
-msgstr "ìììë ìëìíí ì ììëë. %s"
+#: ../modules/text-highlight/languages.c:54
+msgid "_C/C++"
+msgstr "_C/C++"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1861
-msgid "Attendee status updated"
-msgstr "ììì ìíë ìëìííìëë"
+#: ../modules/text-highlight/languages.c:63
+msgid "_C#"
+msgstr "_C#"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1881
-msgid "The meeting is invalid and cannot be updated"
-msgstr "ìëìíê ìëëìê ìëìíí ì ììëë"
+#: ../modules/text-highlight/languages.c:68
+msgid "_Cascade Style Sheet"
+msgstr "_CSS"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1947
-msgid "Attendee status could not be updated because the status is invalid"
-msgstr "ìëë ìí ëëì ììì ìíë ìëìíí ì ììëë"
+#: ../modules/text-highlight/languages.c:73
+msgid "_HTML"
+msgstr "_HTML"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2004
-#: ../plugins/itip-formatter/itip-formatter.c:2042
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "ì íëì ë ìì ìê ëëì ììì ìíë ìëìíí ì ììëë"
+#: ../modules/text-highlight/languages.c:81
+msgid "_Java"
+msgstr "ìë(_J)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2086
-msgid "Meeting information sent"
-msgstr "ëì ìëë ëëìëë"
+#: ../modules/text-highlight/languages.c:87
+msgid "_JavaScript"
+msgstr "ìëìíëí(_J):"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2089
-msgid "Task information sent"
-msgstr "ìì ìëë ëëìëë"
+#: ../modules/text-highlight/languages.c:93
+msgid "_Patch/diff"
+msgstr "íì(_P)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2092
-msgid "Memo information sent"
-msgstr "ëë ìëë ëëìëë"
+#: ../modules/text-highlight/languages.c:99
+msgid "_Perl"
+msgstr "í(_P)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2101
-msgid "Unable to send meeting information, the meeting does not exist"
-msgstr "ëì ìëë ëë ì ììëë. íë ëìì ììëë"
+#: ../modules/text-highlight/languages.c:110
+msgid "_PHP"
+msgstr "_PHP"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2104
-msgid "Unable to send task information, the task does not exist"
-msgstr "ìì ìëë ëë ì ììëë. íë ììì ììëë"
+#: ../modules/text-highlight/languages.c:123
+msgid "_Python"
+msgstr "íìì(_P)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2107
-msgid "Unable to send memo information, the memo does not exist"
-msgstr "ëë ìëë ëë ì ììëë. íë ëëê ììëë"
+#: ../modules/text-highlight/languages.c:128
+msgid "_Ruby"
+msgstr "ëë(_R)"
 
-#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:2173
-msgid "calendar.ics"
-msgstr "ëë.ics"
+#: ../modules/text-highlight/languages.c:135
+msgid "_Tcl/Tk"
+msgstr "_Tcl/Tk"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2178
-msgid "Save Calendar"
-msgstr "ëë ìì"
+#: ../modules/text-highlight/languages.c:141
+msgid "_TeX/LaTeX"
+msgstr "_TeX/LaTeX"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2241
-#: ../plugins/itip-formatter/itip-formatter.c:2252
-msgid "The calendar attached is not valid"
-msgstr "ìëí ëëì ìëëììëë"
+#: ../modules/text-highlight/languages.c:147
+msgid "_Vala"
+msgstr "ëë(_V)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2242
-#: ../plugins/itip-formatter/itip-formatter.c:2253
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
-msgstr ""
-"ëììì ëëì ëì ìëê ëì ììë, ê ëëì ìëë iCalendarê ìëë"
-"ë."
+#: ../modules/text-highlight/languages.c:152
+msgid "_Visual Basic"
+msgstr "ëìì ëìì(_V)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2293
-#: ../plugins/itip-formatter/itip-formatter.c:2321
-#: ../plugins/itip-formatter/itip-formatter.c:2432
-msgid "The item in the calendar is not valid"
-msgstr "ëë ìì íëì ìëëì ììëë"
+#: ../modules/text-highlight/languages.c:159
+msgid "_XML"
+msgstr "_XML"
 
-# free/busy -> ìì ìì/ìì, Microsoft Office XP ìê
-#: ../plugins/itip-formatter/itip-formatter.c:2294
-#: ../plugins/itip-formatter/itip-formatter.c:2322
-#: ../plugins/itip-formatter/itip-formatter.c:2433
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"ëììì ëëì ëì ììë, ëëì íì, ìì, ìì ìì/ìì ìëê íëë "
-"ëì ìì ììëë."
+#: ../modules/text-highlight/languages.c:177
+msgid "_ActionScript"
+msgstr "ìììíëí(_A)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
-msgid "The calendar attached contains multiple items"
-msgstr "ìëí ëëì ìë êì íëì ëì ììëë"
+#: ../modules/text-highlight/languages.c:182
+msgid "_ADA95"
+msgstr "_ADA95"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2336
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
-msgstr "ì íëì ëë ìëíëë, íìì ììíì ê ëëì êììì íëë."
+#: ../modules/text-highlight/languages.c:189
+msgid "_ALGOL 68"
+msgstr "_ALGOL 68"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2860
-msgctxt "cal-itip"
-msgid "None"
-msgstr "ìì"
+#: ../modules/text-highlight/languages.c:194
+msgid "(_G)AWK"
+msgstr "(_G)AWK"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2876
-msgid "Tentatively Accepted"
-msgstr "ììììë ìë"
+#: ../modules/text-highlight/languages.c:199
+msgid "_COBOL"
+msgstr "ìë(_C)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2994
-msgid "This meeting recurs"
-msgstr "ì ìì ëë"
+#: ../modules/text-highlight/languages.c:204
+msgid "_DOS Batch"
+msgstr "_DOS ëì"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2997
-msgid "This task recurs"
-msgstr "ì ìì ëë"
+#: ../modules/text-highlight/languages.c:209
+msgid "_D"
+msgstr "_D"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3000
-msgid "This memo recurs"
-msgstr "ì ëë ëë"
+#: ../modules/text-highlight/languages.c:214
+msgid "_Erlang"
+msgstr "_Erlang"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3231
-msgid "Meeting Invitations"
-msgstr "ëì ìë"
+#: ../modules/text-highlight/languages.c:219
+msgid "_FORTRAN 77"
+msgstr "ííë 77(_F)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3257
-msgid "_Delete message after acting"
-msgstr "ììí ëìì ëìì ìì(_D)"
+#: ../modules/text-highlight/languages.c:225
+msgid "_FORTRAN 90"
+msgstr "ííë 90(_F)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3271
-#: ../plugins/itip-formatter/itip-formatter.c:3304
-msgid "Conflict Search"
-msgstr "ìë êì"
+#: ../modules/text-highlight/languages.c:230
+msgid "_F#"
+msgstr "_F#"
 
-#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3286
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "ìëíë ëìì ìì ëëì ìííììì"
+#: ../modules/text-highlight/languages.c:235
+msgid "_Go"
+msgstr "ìë(_G)"
 
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:199
-msgid "Today %H:%M"
-msgstr "ìë %H:%M"
+#: ../modules/text-highlight/languages.c:240
+msgid "_Haskell"
+msgstr "íìì(_H)"
 
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:203
-msgid "Today %H:%M:%S"
-msgstr "ìë %H:%M:%S"
+#: ../modules/text-highlight/languages.c:245
+msgid "_JSP"
+msgstr "_JSP"
 
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:212
-msgid "Today %l:%M:%S %p"
-msgstr "ìë %p %l:%M:%S"
+#: ../modules/text-highlight/languages.c:250
+msgid "_Lisp"
+msgstr "ëìí(_L):"
 
-#. strftime format of a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:227
-msgid "Tomorrow %H:%M"
-msgstr "ìë %H:%M"
+#: ../modules/text-highlight/languages.c:258
+msgid "_Lotus"
+msgstr "ëíì(_L)"
 
-#. strftime format of a time,
-#. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:231
-msgid "Tomorrow %H:%M:%S"
-msgstr "ìë %H:%M:%S"
+#: ../modules/text-highlight/languages.c:263
+msgid "_Lua"
+msgstr "ëì(_L)"
 
-#. strftime format of a time,
-#. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:236
-msgid "Tomorrow %l:%M %p"
-msgstr "ëì %p %l:%M"
+#: ../modules/text-highlight/languages.c:268
+msgid "_Maple"
+msgstr "ëìí(_M)"
 
-#. strftime format of a time,
-#. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:240
-msgid "Tomorrow %l:%M:%S %p"
-msgstr "ëì %p %l:%M:%S"
+#: ../modules/text-highlight/languages.c:273
+msgid "_Matlab"
+msgstr "ëíë(_M)"
 
-#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:259
-#, c-format
-msgid "%A"
-msgstr "%A"
+#: ../modules/text-highlight/languages.c:278
+msgid "_Maya"
+msgstr "ëì(_M)"
 
-#. strftime format of a weekday and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:264
-msgid "%A %H:%M"
-msgstr "%A %H:%M"
+#: ../modules/text-highlight/languages.c:283
+msgid "_Oberon"
+msgstr "ìëë(_O)"
 
-#. strftime format of a weekday and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:268
-msgid "%A %H:%M:%S"
-msgstr "%A %H:%M:%S"
+#: ../modules/text-highlight/languages.c:288
+msgid "_Objective C"
+msgstr "ìëìíë C(_O)"
 
-#. strftime format of a weekday and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:273
-msgid "%A %l:%M %p"
-msgstr "%A %p %l:%M"
+#: ../modules/text-highlight/languages.c:294
+msgid "_OCaml"
+msgstr "_OCaml"
 
-#. strftime format of a weekday and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:277
-msgid "%A %l:%M:%S %p"
-msgstr "%A %p %l:%M:%S"
+#: ../modules/text-highlight/languages.c:299
+msgid "_Octave"
+msgstr "ìíë(_O)"
 
-#. strftime format of a weekday and a date
-#. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:286
-msgid "%A, %B %e"
-msgstr "%B %eì %A"
+#: ../modules/text-highlight/languages.c:304
+msgid "_Object Script"
+msgstr "ìëìí ìíëí(_O)"
 
-#. strftime format of a weekday, a date
-#. * without a year and a time,
-#. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:292
-msgid "%A, %B %e %H:%M"
-msgstr "%B %eì %A, %H:%M"
+#: ../modules/text-highlight/languages.c:309
+msgid "_Pascal"
+msgstr "íìì(_P)"
 
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:296
-msgid "%A, %B %e %H:%M:%S"
-msgstr "%B %eì %A, %H:%M:%S"
+#: ../modules/text-highlight/languages.c:314
+msgid "_POV-Ray"
+msgstr "_POV-Ray"
 
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
-msgid "%A, %B %e %l:%M %p"
-msgstr "%B %eì %A, %p %l:%M"
+#: ../modules/text-highlight/languages.c:319
+msgid "_Prolog"
+msgstr "íëëê(_P)"
 
-#. strftime format of a weekday, a date without a year
-#. * and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
-msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%B %eì %A, %p %l:%M:%S"
+#: ../modules/text-highlight/languages.c:324
+msgid "_PostScript"
+msgstr "íìíìíëí(_P)"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:311
-msgid "%A, %B %e, %Y"
-msgstr "%Yë %B %eì %A"
+#: ../modules/text-highlight/languages.c:329
+msgid "_R"
+msgstr "_R"
 
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:316
-msgid "%A, %B %e, %Y %H:%M"
-msgstr "%Yë %B %eì %A, %H:%M"
+#: ../modules/text-highlight/languages.c:334
+msgid "_RPM Spec"
+msgstr "_RPM ìí"
 
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:320
-msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%Yë %B %eì %A, %H:%M:%S"
+#: ../modules/text-highlight/languages.c:339
+msgid "_Scala"
+msgstr "ììë(_S)"
 
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:325
-msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Yë %B %eì %A, %p %l:%M"
+#: ../modules/text-highlight/languages.c:344
+msgid "_Smalltalk"
+msgstr "ìëíí(_S)"
 
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:329
-msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Yë %B %eì %A, %p %l:%M:%S"
+#: ../modules/text-highlight/languages.c:350
+msgid "_TCSH"
+msgstr "_TCSH"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:368
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:456
-#: ../plugins/itip-formatter/itip-view.c:543
-msgid "An unknown person"
-msgstr "ëëë ìë"
+#: ../modules/text-highlight/languages.c:355
+msgid "_VHDL"
+msgstr "_VHDL"
 
-#: ../plugins/itip-formatter/itip-view.c:372
-#: ../plugins/itip-formatter/itip-view.c:460
-#: ../plugins/itip-formatter/itip-view.c:547
-#, c-format
-msgid "Please respond on behalf of %s"
-msgstr "%s ìêìë ìëíììì"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
+msgid "Show F_ull vCard"
+msgstr "ìì vCard íì(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:374
-#: ../plugins/itip-formatter/itip-view.c:462
-#: ../plugins/itip-formatter/itip-view.c:549
-#, c-format
-msgid "Received on behalf of %s"
-msgstr "%s ìêìë ëì"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:121
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:219
+msgid "Show Com_pact vCard"
+msgstr "êëí vCard íì(_P)"
 
-#: ../plugins/itip-formatter/itip-view.c:379
-#, c-format
-msgid "%s through %s has published the following meeting information:"
-msgstr "%sëì %sì(ë) íí ëì ëì ìëë êìíìëë:"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:145
+msgid "Save _To Addressbook"
+msgstr "ììëì ìì(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:381
-#, c-format
-msgid "%s has published the following meeting information:"
-msgstr "%sëì ëì ëì ìëë êìíìëë:"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:165
+msgid "There is one other contact."
+msgstr "êí ìëìê í ê ììëë."
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:171
 #, c-format
-msgid "%s has delegated the following meeting to you:"
-msgstr "%sëì ëì ëìì ììíìëë:"
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "êí ìëìê %dê ììëë."
 
-#: ../plugins/itip-formatter/itip-view.c:389
-#, c-format
-msgid "%s through %s requests your presence at the following meeting:"
-msgstr "%sëì %sì(ë) íí ëì ëìì ììíìêë ììíìëë:"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:196
+msgid "Addressbook Contact"
+msgstr "ììë ìëì"
 
-#: ../plugins/itip-formatter/itip-view.c:391
-#, c-format
-msgid "%s requests your presence at the following meeting:"
-msgstr "%sëì ëì ëìì ììíìêë ììíìëë:"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
+msgid "Display the part as an addressbook contact"
+msgstr "ì ëëì ììë ìëìë íì"
 
-#: ../plugins/itip-formatter/itip-view.c:397
-#, c-format
-msgid "%s through %s wishes to add to an existing meeting:"
-msgstr "%sëì %sì(ë) íí êì ëìì ììíê ììíëë:"
+#: ../modules/web-inspector/evolution-web-inspector.c:88
+msgid "_Inspect..."
+msgstr "êì(_I)..."
 
-#: ../plugins/itip-formatter/itip-view.c:399
-#, c-format
-msgid "%s wishes to add to an existing meeting:"
-msgstr "%sëì êì ëìì ììíê ììíëë:"
+#: ../modules/web-inspector/evolution-web-inspector.c:90
+msgid "Inspect the HTML content (debugging feature)"
+msgstr "HTML ëìì êì(ëëê êë)"
 
-#: ../plugins/itip-formatter/itip-view.c:403
-#, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
-msgstr "%sëì %sì(ë) íí ëì ëìì ìì ìëë ëê ììíëë:"
+#: ../modules/web-inspector/evolution-web-inspector.c:102
+msgid "Evolution Web Inspector"
+msgstr "ìëëì ì êì"
 
-#: ../plugins/itip-formatter/itip-view.c:405
-#, c-format
-msgid "%s wishes to receive the latest information for the following meeting:"
-msgstr "%sëì ëì ëìì ìì ìëë ëê ììíëë:"
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "ì ëììë ëì ëì ìê(_D)."
 
-#: ../plugins/itip-formatter/itip-view.c:409
-#, c-format
-msgid "%s through %s has sent back the following meeting response:"
-msgstr "%sëì %sì(ë) íí ëìê êì ëì ìëì ëëìëë:"
+#: ../plugins/attachment-reminder/attachment-reminder.c:590
+#: ../plugins/templates/templates.c:469
+msgid "Keywords"
+msgstr "íìë"
 
-#: ../plugins/itip-formatter/itip-view.c:411
-#, c-format
-msgid "%s has sent back the following meeting response:"
-msgstr "%sëì ëìê êì ëì ìëì ëëìëë:"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Message has no attachments"
+msgstr "ëììì ìëê ììëë"
 
-#: ../plugins/itip-formatter/itip-view.c:415
-#, c-format
-msgid "%s through %s has canceled the following meeting:"
-msgstr "%sëì %sì(ë) íí ëì ëìì ììíìëë:"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+"ì ëìììì ìë íìì ëì ììì íëë íìëë ìììë, ìë íìì "
+"ììëë."
 
-#: ../plugins/itip-formatter/itip-view.c:417
-#, c-format
-msgid "%s has canceled the following meeting:"
-msgstr "%sëì ëì ëìì ììíìëë:"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "_Add Attachment..."
+msgstr "ìëíì ìê(_A)..."
 
-#: ../plugins/itip-formatter/itip-view.c:421
-#, c-format
-msgid "%s through %s has proposed the following meeting changes."
-msgstr "%sëì %sì(ë) íí ëì ëì ëêì ììíìëë."
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Edit Message"
+msgstr "ëìì íì(_E)"
 
-#: ../plugins/itip-formatter/itip-view.c:423
-#, c-format
-msgid "%s has proposed the following meeting changes:"
-msgstr "%sëì ëì ëì ëêì ììíìëë:"
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "ìë ìë"
 
-#: ../plugins/itip-formatter/itip-view.c:427
-#, c-format
-msgid "%s through %s has declined the following meeting changes:"
-msgstr "%sëì %sì(ë) íí ëì ëì ëêì êìíìëë:"
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "ëì ëììì ìë ìêë ììì ë ìëëë."
 
-#: ../plugins/itip-formatter/itip-view.c:429
-#, c-format
-msgid "%s has declined the following meeting changes:"
-msgstr "%sëì ëì ëì ëêì êìíìëë:"
+#: ../plugins/bbdb/bbdb.c:650 ../plugins/bbdb/bbdb.c:659
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr "ìë ìëì"
 
-#: ../plugins/itip-formatter/itip-view.c:467
-#, c-format
-msgid "%s through %s has published the following task:"
-msgstr "%sëì %sì(ë) íí ëì ììì êìíìëë:"
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:674
+msgid "Create _address book entries when sending mails"
+msgstr "ëìì ëë ë ììëì íë ëëê(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:469
-#, c-format
-msgid "%s has published the following task:"
-msgstr "%sëì ëì ììì êìíìëë:"
+#: ../plugins/bbdb/bbdb.c:682
+msgid "Select Address book for Automatic Contacts"
+msgstr "ìë ìëìë ììí ììëì ìííììì"
 
-#: ../plugins/itip-formatter/itip-view.c:474
-#, c-format
-msgid "%s requests the assignment of %s to the following task:"
-msgstr "%sëì ëì ììì %sëì íëì ììíìëë:"
+#: ../plugins/bbdb/bbdb.c:699
+msgid "Instant Messaging Contacts"
+msgstr "ììíì ëìì ìëì"
 
-#: ../plugins/itip-formatter/itip-view.c:477
-#, c-format
-msgid "%s through %s has assigned you a task:"
-msgstr "%sëì %sì(ë) íí ììì íëíìëë:"
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:714
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "íì ìê ëëì ìëì ìë ë êëì ëêí(_S)"
 
-#: ../plugins/itip-formatter/itip-view.c:479
-#, c-format
-msgid "%s has assigned you a task:"
-msgstr "%sëì ììì íëíìëë:"
+#: ../plugins/bbdb/bbdb.c:722
+msgid "Select Address book for Pidgin buddy list"
+msgstr "íì ìê ëëì ììí ììëì ìííììì"
 
-#: ../plugins/itip-formatter/itip-view.c:485
-#, c-format
-msgid "%s through %s wishes to add to an existing task:"
-msgstr "%sëì %sì(ë) íí êì ììì ììíê ììíëë:"
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:735
+msgid "Synchronize with _buddy list now"
+msgstr "ìê ìê ëëê ëêí(_B)"
 
-#: ../plugins/itip-formatter/itip-view.c:487
-#, c-format
-msgid "%s wishes to add to an existing task:"
-msgstr "%sëì êì ììì ììíê ììíëë:"
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
 
-#: ../plugins/itip-formatter/itip-view.c:491
-#, c-format
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
-msgstr "%sëì %sì(ë) íí ëì ìì íëì ìê ìëë ëê ììíëë:"
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+"ììë êë ëì ììì ìííëë.\n"
+"\n"
+"ëììì íìí ëëë ìëìë ìëê ììëì ììë ììëì ëìëë. ë "
+"ìê ëëìì ììíì ëìì ìëì ìëë ìì ëìëë."
 
-#: ../plugins/itip-formatter/itip-view.c:493
-#, c-format
-msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
-msgstr "%sëì ëì ìì íëì ìê ìëë ëê ììíëë:"
+#: ../plugins/dbx-import/dbx-importer.c:287
+msgid "Importing Outlook Express data"
+msgstr "ììë ììíëì ëìí êììê"
 
-# FIXME: through what?
-#: ../plugins/itip-formatter/itip-view.c:497
-#, c-format
-msgid "%s through %s has sent back the following assigned task response:"
-msgstr "%sëì %sì(ë) íí ëì ìì íë ìëì ëëìëë:"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Outlook DBX import"
+msgstr "ììë DBX êììê"
 
-#: ../plugins/itip-formatter/itip-view.c:499
-#, c-format
-msgid "%s has sent back the following assigned task response:"
-msgstr "%sëì ëì ìì íë ìëì ëëìëë:"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "ììë ììíëì 5/6 êì íë (.dbx)"
 
-#: ../plugins/itip-formatter/itip-view.c:503
-#, c-format
-msgid "%s through %s has canceled the following assigned task:"
-msgstr "%sëì %sì(ë) íí ëì íë ììì ììíìëë:"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Import Outlook Express messages from DBX file"
+msgstr "DBX íìì ììë ììíëì ëììë êììëë"
 
-#: ../plugins/itip-formatter/itip-view.c:505
-#, c-format
-msgid "%s has canceled the following assigned task:"
-msgstr "%sëì ëì íë ììì ììíìëë:"
+# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
+#: ../plugins/email-custom-header/email-custom-header.c:291
+msgctxt "email-custom-header-Security"
+msgid "Security:"
+msgstr "ëì:"
 
-#: ../plugins/itip-formatter/itip-view.c:509
-#, c-format
-msgid "%s through %s has proposed the following task assignment changes:"
-msgstr "%sëì %sì(ë) íí ëì ìì íë ëêì ììíìëë:"
+# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
+#: ../plugins/email-custom-header/email-custom-header.c:295
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "êì"
 
-#: ../plugins/itip-formatter/itip-view.c:511
-#, c-format
-msgid "%s has proposed the following task assignment changes:"
-msgstr "%sëì ëì ìì íë ëêì ììíìëë:"
+# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
+#: ../plugins/email-custom-header/email-custom-header.c:296
+msgctxt "email-custom-header-Security"
+msgid "Unclassified"
+msgstr "ëëìë"
 
-#: ../plugins/itip-formatter/itip-view.c:515
-#, c-format
-msgid "%s through %s has declined the following assigned task:"
-msgstr "%sëì %sì(ë) íí ëì ìì íëì êìíìëë:"
+# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
+#: ../plugins/email-custom-header/email-custom-header.c:297
+msgctxt "email-custom-header-Security"
+msgid "Protected"
+msgstr "ëí"
 
-#: ../plugins/itip-formatter/itip-view.c:517
-#, c-format
-msgid "%s has declined the following assigned task:"
-msgstr "%sëì ëì ìì íëì êìíìëë:"
+# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
+#: ../plugins/email-custom-header/email-custom-header.c:298
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "ìí"
 
-#: ../plugins/itip-formatter/itip-view.c:554
-#, c-format
-msgid "%s through %s has published the following memo:"
-msgstr "%sëì %sì(ë) íí ëì ëëë êìíìëë:"
+# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
+#: ../plugins/email-custom-header/email-custom-header.c:299
+msgctxt "email-custom-header-Security"
+msgid "Secret"
+msgstr "ëë"
 
-#: ../plugins/itip-formatter/itip-view.c:556
-#, c-format
-msgid "%s has published the following memo:"
-msgstr "%sëì ëì ëëë êìíìëë:"
+# FIXME: ìê ëìíì ë? ììí íëì ìë êì ìì.
+#: ../plugins/email-custom-header/email-custom-header.c:300
+msgctxt "email-custom-header-Security"
+msgid "Top secret"
+msgstr "ìêëë"
 
-#: ../plugins/itip-formatter/itip-view.c:561
-#, c-format
-msgid "%s through %s wishes to add to an existing memo:"
-msgstr "%sëì %sì(ë) íí êì ëëì ëìì ìêíê ììíëë:"
+#: ../plugins/email-custom-header/email-custom-header.c:357
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "ìì"
 
-#: ../plugins/itip-formatter/itip-view.c:563
-#, c-format
-msgid "%s wishes to add to an existing memo:"
-msgstr "%sëì êì ëëì ëìì ìêíê ììíëë:"
+#: ../plugins/email-custom-header/email-custom-header.c:530
+msgid "_Custom Header"
+msgstr "ììì ìì íë(_C)"
 
-#: ../plugins/itip-formatter/itip-view.c:567
-#, c-format
-msgid "%s through %s has canceled the following shared memo:"
-msgstr "%sëì %sì(ë) íí ëì êì ëëë ììíìëë:"
+#. 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:799
+msgid ""
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
+msgstr ""
+"ììì ìì íë êì ììíë íìì:\n"
+"ììì ìì íëì íì êì \";\"ìë êëíëë."
 
-#: ../plugins/itip-formatter/itip-view.c:569
-#, c-format
-msgid "%s has canceled the following shared memo:"
-msgstr "%sëì ëì êì ëëë ììíìëë:"
+#: ../plugins/email-custom-header/email-custom-header.c:851
+msgid "Key"
+msgstr "í"
 
-#: ../plugins/itip-formatter/itip-view.c:693
-msgid "All day:"
-msgstr "íë ìì:"
+#: ../plugins/email-custom-header/email-custom-header.c:867
+#: ../plugins/templates/templates.c:477
+msgid "Values"
+msgstr "ê"
 
-#: ../plugins/itip-formatter/itip-view.c:703
-msgid "Start day:"
-msgstr "ìì ëì:"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+msgid "Custom Header"
+msgstr "ììì ìì íë"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:703
-#: ../plugins/itip-formatter/itip-view.c:1061
-msgid "Start time:"
-msgstr "ìì ìê:"
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Add custom headers to outgoing mail messages."
+msgstr "ëëë ëììì ììì ìì íëë ìêíëë."
 
-#: ../plugins/itip-formatter/itip-view.c:715
-msgid "End day:"
-msgstr "ë ëì:"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "ììëì ììì ìì íë"
 
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:715
-#: ../plugins/itip-formatter/itip-view.c:1072
-msgid "End time:"
-msgstr "ëì ìê:"
+#: ../plugins/external-editor/external-editor.c:114
+msgid "Command to be executed to launch the editor: "
+msgstr "íìêë ìíí ëëì: "
 
-#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:851
-msgid "_Open Calendar"
-msgstr "ëë ìê(_O)"
+#: ../plugins/external-editor/external-editor.c:115
+msgid ""
+"For XEmacs use \"xemacs\"\n"
+"For Vim use \"gvim -f\""
+msgstr ""
+"ìììëìì êì \"xemacs\"ë ììíê\n"
+"Vimì \"gvim -f\"ë ììíììì"
 
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:861
-#: ../plugins/itip-formatter/itip-view.c:867
-#: ../plugins/itip-formatter/itip-view.c:884
-#: ../plugins/itip-formatter/itip-view.c:889
-msgid "_Decline"
-msgstr "êë(_D)"
+#: ../plugins/external-editor/external-editor.c:396
+#: ../plugins/external-editor/external-editor.c:398
+msgid "Compose in External Editor"
+msgstr "ìë íìêìì ìì"
 
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
-#: ../plugins/itip-formatter/itip-view.c:870
-#: ../plugins/itip-formatter/itip-view.c:886
-#: ../plugins/itip-formatter/itip-view.c:891
-msgid "A_ccept"
-msgstr "ìë(_C)"
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid "External Editor"
+msgstr "ìë íìê"
 
-#: ../plugins/itip-formatter/itip-view.c:861
-msgid "_Decline all"
-msgstr "ëë êë(_D)"
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "ìë íìí ëì ëììë ììí ë ìë íìêë ììíëë."
 
-#: ../plugins/itip-formatter/itip-view.c:862
-msgid "_Tentative all"
-msgstr "ëë ììì(_T)"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+msgid "Editor not launchable"
+msgstr "íìêë ììí ì ììëë"
 
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:868
-#: ../plugins/itip-formatter/itip-view.c:885
-#: ../plugins/itip-formatter/itip-view.c:890
-msgid "_Tentative"
-msgstr "ììì(_T)"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"íëêì êë ìììì ììí ìë íìêë ìíí ì ììëë. ëë íìê"
+"ë ììí ëììì."
 
-#: ../plugins/itip-formatter/itip-view.c:863
-msgid "A_ccept all"
-msgstr "ëë ìë(_C)"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Cannot create Temporary File"
+msgstr "ìì íìì ëë ì ììëë"
 
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:874
-msgid "_Send Information"
-msgstr "ìë ëëê(_S)"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr "ëìì ììí ìì íìì ëë ì ììëë. ëìì ëì ìëíììì."
 
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:878
-msgid "_Update Attendee Status"
-msgstr "ììì ìí ìëìí(_U)"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid "External editor still running"
+msgstr "ìë íìêê ìì ìí ììëë"
 
-#: ../plugins/itip-formatter/itip-view.c:881
-msgid "_Update"
-msgstr "ìëìí(_U)"
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+"ìë íìêê ìì ìí ììëë. ì íìêê ìí ìì ëììë ëì íì ì"
+"ì ëì ì ììëë."
 
-#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1092
-#: ../plugins/itip-formatter/itip-view.c:1148
-msgid "Comment:"
-msgstr "ìë:"
+#: ../plugins/face/face.c:292
+msgid "Select a Face Picture"
+msgstr "ìê ììì êëììì"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
-msgid "Send _reply to sender"
-msgstr "ëë ììê íì(_R)"
+#: ../plugins/face/face.c:302
+msgid "Image files"
+msgstr "êë íì"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
-msgid "Send _updates to attendees"
-msgstr "ììììê ìëìí ëëê(_U)"
+#: ../plugins/face/face.c:361
+msgid "_Insert Face picture by default"
+msgstr "êëêìë ìê ìì ëê(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1180
-msgid "_Apply to all instances"
-msgstr "ëë êìì ìì(_A)"
+#: ../plugins/face/face.c:374
+msgid "Load new _Face picture"
+msgstr "ì ìê ìì ììëìê(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1191
-msgid "Show time as _free"
-msgstr "ìêì ìì ìììë íì(_F)"
+#: ../plugins/face/face.c:435
+msgid "Include _Face"
+msgstr "ìê ìì íí(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1194
-msgid "_Preserve my reminder"
-msgstr "ë ëë ìë ìì(_P)"
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "ëëë ëììì ìì ìê ììì ìëíëë."
 
-#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1200
-msgid "_Inherit reminder"
-msgstr "ëë ìë ìì(_I)"
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "ìê ìí"
 
-#: ../plugins/itip-formatter/itip-view.c:1982
-msgid "_Tasks:"
-msgstr "ìì(_T):"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "The file cannot be read"
+msgstr "íë íìì ìì ì ììëë"
 
-#: ../plugins/itip-formatter/itip-view.c:1984
-msgid "_Memos:"
-msgstr "ëë(_M):"
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Invalid Image Size"
+msgstr "êë íêê ìëëììëë"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "ITIP íëí"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "48 x 48 íêì êë íìì ìííììì"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "ëì ëììì \"text/calendar\" MIME ëëì íìíëë."
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "Not an image"
+msgstr "êëì ìëëë"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-"íì ìììê ìë ìëì ì íìì íìëë. ìììë ìêíìêìëê?"
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr "ìíí íìì ìëë PNG êë íìì ìëëë. ìë: {0}"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
-msgid "This meeting has been delegated"
-msgstr "ì ëìì ììëììëë"
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "ëì êë"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
-msgstr "'{0}'ì(ê) ëìì ììíìëë. {1} ëëìì ìêíìêìëê?"
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "êëì ëì ëìììì ìì íìíëë."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:350
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:365
 msgid "Get List _Archive"
 msgstr "ëìí ìììë ëê(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "Get an archive of the list this message belongs to"
 msgstr "ì ëììê ìí ëìë ëìíì ìììëë ëìëë"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:357
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:372
 msgid "Get List _Usage Information"
 msgstr "ëìí ìì ìë ëê(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ì ëììê ìí ëìë ëìíì ììëë ìëë ëìëë"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:379
 msgid "Contact List _Owner"
 msgstr "ëìí ëëììê ìë(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "ì ëììê ìí ëìë ëìíì ììììê ìëíëë"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:386
 msgid "_Post Message to List"
 msgstr "ëìíì ëìì ëëê(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "ì ëììê ìí ëìë ëìíì ëììë êìíëë"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:393
 msgid "_Subscribe to List"
 msgstr "ëìíì êì(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "ì ëììê ìí ëìë ëìíì êìíëë"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:400
 msgid "_Unsubscribe from List"
 msgstr "ëìíìì íí(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "ì ëììê ìí ëìë ëìíìì íííëë"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:409
 msgid "Mailing _List"
 msgstr "ëìë ëìí(_L)"
 
@@ -19416,69 +18335,56 @@ msgstr ""
 "\n"
 "íë: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:384
+#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:421
 #, c-format
-msgid ""
-"You have received %d new message\n"
-"in %s."
-msgid_plural ""
-"You have received %d new messages\n"
-"in %s."
-msgstr[0] ""
-"ìë %dêì ëììë ëììëë.\n"
-"(%s íë)"
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "ìë %dêì ëììë ëììëë."
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:409
+#: ../plugins/mail-notification/mail-notification.c:410
 #, c-format
 msgid "Subject: %s"
 msgstr "ìë: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:420
-#, c-format
-msgid "You have received %d new message."
-msgid_plural "You have received %d new messages."
-msgstr[0] "ìë %dêì ëììë ëììëë."
-
-#: ../plugins/mail-notification/mail-notification.c:429
-#: ../plugins/mail-notification/mail-notification.c:437
-#: ../plugins/mail-notification/mail-notification.c:440
-msgid "New email"
-msgstr "ì ëì"
+#: ../plugins/mail-notification/mail-notification.c:427
+msgid "New email in Evolution"
+msgstr "ìëëììì ì ììëì"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:461
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid "Show %s"
 msgstr "%s íì"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:658
 msgid "_Play sound when a new message arrives"
 msgstr "ì ëììê ëìíë ììë ìì(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:690
 msgid "_Beep"
 msgstr "ì ìë(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "Use sound _theme"
 msgstr "ììë íë ìì(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:722
 msgid "Play _file:"
 msgstr "íì ìì(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:731
 msgid "Select sound file"
 msgstr "ììë íìì êëììì"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:787
 msgid "Notify new messages for _Inbox only"
 msgstr "ëì íìíì êììë ì ëìì ìë(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:797
 msgid "Show _notification when a new message arrives"
 msgstr "ì ëììê ëìíì ë ìë íì(_N)"
 
@@ -19491,12 +18397,12 @@ 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:243
+#: ../plugins/mail-to-task/mail-to-task.c:239
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "%s ëììì ëëìì"
 
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19504,7 +18410,7 @@ msgid ""
 msgstr ""
 "ìíí ëëì ìë '%s' íìê ëì ììëë. ìì íìë íìíìêìëê?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:621
+#: ../plugins/mail-to-task/mail-to-task.c:625
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19512,7 +18418,7 @@ msgid ""
 msgstr ""
 "ìíí ëëì ìë '%s' ììì ëì ììëë. ìì ììì íìíìêìëê?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:624
+#: ../plugins/mail-to-task/mail-to-task.c:628
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19521,7 +18427,7 @@ msgstr ""
 "ìíí ëëì ìë '%s' ëëê ëì ììëë. ìì ëëë íìíìêìëê?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:643
+#: ../plugins/mail-to-task/mail-to-task.c:647
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -19533,7 +18439,7 @@ msgstr[0] ""
 "íìë ëíí ëìì %dê ìííìëë. ìëë ëë ìêíìêìëê?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -19545,7 +18451,7 @@ msgstr[0] ""
 "ìììë ëíí ëìì %dê ìííìëë. ìëë ëë ìêíìêìëê?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:655
+#: ../plugins/mail-to-task/mail-to-task.c:659
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -19556,29 +18462,33 @@ msgid_plural ""
 msgstr[0] ""
 "ììë ëíí ëìì %dê ìííìëë. ìëë ëë ìêíìêìëê?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:676
+#: ../plugins/mail-to-task/mail-to-task.c:680
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "ëëì ëìì ëíì êì íìêìëê?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:751
+#: ../plugins/mail-to-task/mail-to-task.c:755
 msgid "[No Summary]"
 msgstr "[ìì ìì]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:767
 msgid "Invalid object returned from a server"
 msgstr "ìëìì ìëëì ìì ìëìíë ëììëë"
 
-#: ../plugins/mail-to-task/mail-to-task.c:815
+#: ../plugins/mail-to-task/mail-to-task.c:819
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ìë ì ìëê ëìíìëë: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:840
+#: ../plugins/mail-to-task/mail-to-task.c:844
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ëëì ì ì ììëë. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:847
+#: ../plugins/mail-to-task/mail-to-task.c:844
+msgid "Unknown error."
+msgstr "ì ì ìë ìë."
+
+#: ../plugins/mail-to-task/mail-to-task.c:851
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19586,7 +18496,7 @@ msgstr ""
 "ìíí ììê ìê ìììëì ìêì íìë ëë ì ììëë. ëë ììë ì"
 "ííììì."
 
-#: ../plugins/mail-to-task/mail-to-task.c:850
+#: ../plugins/mail-to-task/mail-to-task.c:854
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19594,7 +18504,7 @@ msgstr ""
 "ìíí ììê ìê ìììëì ìêì ììì ëë ì ììëë. ëë ììë ì"
 "ííììì."
 
-#: ../plugins/mail-to-task/mail-to-task.c:853
+#: ../plugins/mail-to-task/mail-to-task.c:857
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19602,44 +18512,39 @@ msgstr ""
 "ìíí ììê ìê ìììëì ìêì ëëë ëë ì ììëë. ëë ììë ì"
 "ííììì."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1103
-#, c-format
-msgid "Cannot get source list. %s"
-msgstr "ìì ëëì ëì ì ììëë. %s"
-
-#: ../plugins/mail-to-task/mail-to-task.c:1164
+#: ../plugins/mail-to-task/mail-to-task.c:1186
 msgid "No writable calendar is available."
 msgstr "ìê êëí ëëì ììëë."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
-msgid "Create an _Event"
-msgstr "íì ëëê(_E)"
+#: ../plugins/mail-to-task/mail-to-task.c:1270
+msgid "Create an _Appointment"
+msgstr "ìì ëëê(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../plugins/mail-to-task/mail-to-task.c:1272
 msgid "Create a new event from the selected message"
 msgstr "ìíí ëìììì ì íìë ëëëë"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1265
+#: ../plugins/mail-to-task/mail-to-task.c:1277
 msgid "Create a Mem_o"
 msgstr "ëë ëëê(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1267
+#: ../plugins/mail-to-task/mail-to-task.c:1279
 msgid "Create a new memo from the selected message"
 msgstr "ìíí ëìììì ì ëëë ëëëë"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1284
 msgid "Create a _Task"
 msgstr "ìì ëëê(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1274
+#: ../plugins/mail-to-task/mail-to-task.c:1286
 msgid "Create a new task from the selected message"
 msgstr "ìíí ëìììì ì ììì ëëëë"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1294
 msgid "Create a _Meeting"
 msgstr "ëì ëëê(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1296
 msgid "Create a new meeting from the selected message"
 msgstr "ìíí ëìììì ì ëìì ëëëë"
 
@@ -19659,15 +18564,15 @@ msgstr ""
 "íì íëë ìì ëììë íìíìêìëê? ìëë íì íëì ê ìë íë"
 "ì ëë ëììë ëë ìì ëììë íìíìêìëê?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:216
+#: ../plugins/mark-all-read/mark-all-read.c:185
 msgid "In Current Folder and _Subfolders"
 msgstr "íì íë ë íì íëìì(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:230
+#: ../plugins/mark-all-read/mark-all-read.c:199
 msgid "In Current _Folder Only"
 msgstr "íì íëììë(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:576
+#: ../plugins/mark-all-read/mark-all-read.c:545
 msgid "Mark Me_ssages as Read"
 msgstr "ëììë ìì êìë íì(_S)"
 
@@ -19679,58 +18584,6 @@ msgstr "ëë ìì êìë íì"
 msgid "Mark all messages in a folder as read."
 msgstr "íëì ëë ëììë ìì êìë íìíëë."
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid "Prefer Plain Text"
-msgstr "ìë íìí ìí"
-
-#. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Plain Text Mode"
-msgstr "ìë íìí ëë"
-
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
-msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr "ëì ëììì HTMLì ìëëë ìë íìíë ëëë."
-
-#: ../plugins/prefer-plain/prefer-plain.c:250
-msgid "Show HTML if present"
-msgstr "HTMLì ììë íì"
-
-#: ../plugins/prefer-plain/prefer-plain.c:251
-msgid "Let Evolution choose the best part to show."
-msgstr "ìëëììì ììì ëê ìì ëëì íì."
-
-#: ../plugins/prefer-plain/prefer-plain.c:254
-msgid "Show plain text if present"
-msgstr "ìë íìíê ììë íì"
-
-#: ../plugins/prefer-plain/prefer-plain.c:255
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
-msgstr ""
-"ìë íìíê ììë íìíê, ìë íìíê ììë ìëëììì ëìì ëë"
-"ì êë ìëë."
-
-#: ../plugins/prefer-plain/prefer-plain.c:259
-msgid "Only ever show plain text"
-msgstr "ìë íìíë íì"
-
-#: ../plugins/prefer-plain/prefer-plain.c:260
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
-msgstr ""
-"íì ìë íìí ëëë íìíê, ëë ëëì íìíë ìë íìë ëëëë."
-
-#: ../plugins/prefer-plain/prefer-plain.c:311
-msgid "Show s_uppressed HTML parts as attachments"
-msgstr "HTML ëëì ìêê ìëë íì(_U)"
-
-#: ../plugins/prefer-plain/prefer-plain.c:333
-msgid "HTML _Mode"
-msgstr "HTML ëë(_M)"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "ììë PST êììê"
@@ -19743,39 +18596,38 @@ msgstr "ììë êì íë (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "PST íìì ììë ëììë êììëë"
 
-#: ../plugins/pst-import/pst-importer.c:543
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "_Mail"
 msgstr "ëì(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "Destination folder:"
 msgstr "ëì íë:"
 
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:594
 msgid "_Address Book"
 msgstr "ììë(_A)"
 
-#: ../plugins/pst-import/pst-importer.c:586
+#: ../plugins/pst-import/pst-importer.c:599
 msgid "A_ppointments"
 msgstr "ìì(_P)"
 
-#: ../plugins/pst-import/pst-importer.c:591 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "ìì(_T)"
 
 # journal -> ìì, Microsoft Office XP ìê
-#: ../plugins/pst-import/pst-importer.c:596
+#: ../plugins/pst-import/pst-importer.c:609
 msgid "_Journal entries"
 msgstr "ìì íë(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:707
+#: ../plugins/pst-import/pst-importer.c:721
 msgid "Importing Outlook data"
 msgstr "ììë ëìí êììê"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:147
-#: ../plugins/publish-calendar/publish-calendar.c:155
-#: ../plugins/publish-calendar/publish-calendar.c:157
+#: ../plugins/publish-calendar/publish-calendar.c:145
+#: ../plugins/publish-calendar/publish-calendar.c:152
 msgid "Calendar Publishing"
 msgstr "ëë êì"
 
@@ -19787,49 +18639,49 @@ msgstr "ìì"
 msgid "Publish calendars to the web."
 msgstr "ëëì ìì êìíëë."
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
-#: ../plugins/publish-calendar/publish-calendar.c:469
+#: ../plugins/publish-calendar/publish-calendar.c:211
+#: ../plugins/publish-calendar/publish-calendar.c:463
 #, c-format
 msgid "Could not open %s:"
 msgstr "'%s'ì(ë) ì ì ììëë:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:220
+#: ../plugins/publish-calendar/publish-calendar.c:213
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "'%s'ì(ë) ì ì ììëë: ì ì ìë ìëê ëìíìëë"
 
-#: ../plugins/publish-calendar/publish-calendar.c:240
+#: ../plugins/publish-calendar/publish-calendar.c:233
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "'%s'ì êìíëë ìëê ëìíìëë:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:242
+#: ../plugins/publish-calendar/publish-calendar.c:235
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "'%s'ì ìêììë êìë ëììëë"
 
-#: ../plugins/publish-calendar/publish-calendar.c:286
+#: ../plugins/publish-calendar/publish-calendar.c:279
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "'%s'ì ëìíê ìííìëë:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../plugins/publish-calendar/publish-calendar.c:626
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "ìì(_N)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:765
+#: ../plugins/publish-calendar/publish-calendar.c:774
 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:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1104
 msgid "Could not create publish thread."
 msgstr "êíëë êìí ì ììëë."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../plugins/publish-calendar/publish-calendar.c:1112
 msgid "_Publish Calendar Information"
 msgstr "ëë ìë êì(_P)"
 
@@ -19847,11 +18699,11 @@ msgstr "ëì"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
-msgstr "ìë (ëì ëëë íí)"
+msgstr "ìë(ëì ëëë íí)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
 msgid "Secure FTP (SFTP)"
-msgstr "ëì FTP (SFTP)"
+msgstr "ëì FTP(SFTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
@@ -19859,11 +18711,11 @@ msgstr "êê FTP"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "FTP (with login)"
-msgstr "FTP (ëêì)"
+msgstr "FTP(ëêì)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:12
 msgid "Windows share"
-msgstr "ìëìì êì"
+msgstr "ìëì êì"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "WebDAV (HTTP)"
@@ -19923,419 +18775,179 @@ msgstr "ìí ìì(_R)"
 msgid "Publishing Location"
 msgstr "êì ìì"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:94
-#: ../plugins/publish-calendar/publish-format-ical.c:91
+#: ../plugins/publish-calendar/publish-format-fb.c:97
+#: ../plugins/publish-calendar/publish-format-ical.c:95
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ëëì êìí ì ììëë: ëë ëìëê ììëë"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:521
+#: ../plugins/publish-calendar/url-editor-dialog.c:539
 msgid "New Location"
 msgstr "ì ìì"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:523
+#: ../plugins/publish-calendar/url-editor-dialog.c:541
 msgid "Edit Location"
 msgstr "ìì íì"
 
 #. 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
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Description List"
 msgstr "ìë ëë"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Categories List"
 msgstr "ëë ëë"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Comment List"
 msgstr "ëë ëë"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Contact List"
 msgstr "ìëì ëë"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Start"
 msgstr "ìì"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "ë"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "êí"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "íìí ìë"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Attendees List"
 msgstr "ììì ëë"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Modified"
 msgstr "ëë"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:562
 msgid "A_dvanced options for the CSV format"
-msgstr "CSV íìì êê ìì(_D)"
-
-#: ../plugins/save-calendar/csv-format.c:581
-msgid "Prepend a _header"
-msgstr "ìì íë ëì(_H)"
-
-#: ../plugins/save-calendar/csv-format.c:590
-msgid "_Value delimiter:"
-msgstr "ê êë(_V):"
-
-#: ../plugins/save-calendar/csv-format.c:601
-msgid "_Record delimiter:"
-msgstr "ëìë êë(_R):"
-
-#: ../plugins/save-calendar/csv-format.c:612
-msgid "_Encapsulate values with:"
-msgstr "êì ëëìë ëì(_E):"
-
-#: ../plugins/save-calendar/csv-format.c:638
-msgid "Comma separated values (.csv)"
-msgstr "ìëë êëí ê (.csv)"
-
-#: ../plugins/save-calendar/ical-format.c:175 ../shell/e-shell-utils.c:199
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
-msgid "Save Selected"
-msgstr "ìíí ìí ìì"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Save a calendar or task list to disk."
-msgstr "ëëìë ìì ëëì ëìíì ììíëë."
-
-#.
-#. * Translator: the %FT%T is the thirth argument for a strftime function.
-#. * 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:152
-msgid "%FT%T"
-msgstr "%FT%T"
-
-#: ../plugins/save-calendar/rdf-format.c:387
-msgid "RDF (.rdf)"
-msgstr "RDF (.rdf)"
-
-#: ../plugins/save-calendar/save-calendar.c:127
-msgid "_Format:"
-msgstr "íì(_F):"
-
-#: ../plugins/save-calendar/save-calendar.c:189
-msgid "Select destination file"
-msgstr "ëì íì ìí"
-
-#: ../plugins/save-calendar/save-calendar.c:344
-msgid "Save the selected calendar to disk"
-msgstr "ìíí ëëì ëìíì ììíëë"
-
-#: ../plugins/save-calendar/save-calendar.c:375
-msgid "Save the selected memo list to disk"
-msgstr "ìíí ëë ëëì ëìíì ììíëë"
-
-#: ../plugins/save-calendar/save-calendar.c:406
-msgid "Save the selected task list to disk"
-msgstr "ìíí ìì ëëì ëìíì ììíëë"
-
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid ""
-"Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
-"an email you are replying to."
-msgstr ""
-"ìì íëêìì ììí ìì. $ORIG[subject], $ORIG[from], $ORIG[to], $ORIG"
-"[body] ëìì ëìë ììíëë. ì ëìë ëìíë ëì êì ëì ìë êì"
-"ë ëëëë."
-
-#: ../plugins/templates/templates.c:1105
-msgid "No Title"
-msgstr "ìë ìì"
-
-#: ../plugins/templates/templates.c:1217
-msgid "Save as _Template"
-msgstr "ìììë ìì(_T)"
-
-#: ../plugins/templates/templates.c:1219
-msgid "Save as Template"
-msgstr "ìììë ìì"
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "TNEF Decoder"
-msgstr "TNEF ëìë"
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "ëìíëìíí ììëìì ëë TNEF ìëë (winmail.dat) ëìëíëë."
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-msgid "Inline vCards"
-msgstr "ëì vCard"
-
-#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
-msgid "Show vCards directly in mail messages."
-msgstr "vCardë ëì ëìììì ìì íìíëë."
-
-#: ../plugins/vcard-inline/vcard-inline.c:208
-#: ../plugins/vcard-inline/vcard-inline.c:293
-msgid "Show Full vCard"
-msgstr "vCard ììí ëê"
-
-#: ../plugins/vcard-inline/vcard-inline.c:211
-msgid "Show Compact vCard"
-msgstr "vCard êëí ëê"
-
-#: ../plugins/vcard-inline/vcard-inline.c:272
-msgid "There is one other contact."
-msgstr "êí ìëìê í ê ììëë."
-
-#: ../plugins/vcard-inline/vcard-inline.c:281
-#, c-format
-msgid "There is %d other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "êí ìëìê %dê ììëë."
-
-#: ../plugins/vcard-inline/vcard-inline.c:302
-msgid "Save in Address Book"
-msgstr "ììëì ìì"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "WebDAV contacts"
-msgstr "WebDAV ìëì"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
-msgid "Add WebDAV contacts to Evolution."
-msgstr "WebDAV ìëìë ìëëìì ìêíëë."
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:70
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:287
-msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "IfMatch ííê(_A) (ìíì 2.2.8 ëë ëììì íì)"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "ìê ìì ìíìì ììí ë ëêíí íëì êë ëë"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Default window Y coordinate"
-msgstr "êë ì ìë ìí"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "The default Y coordinate for the main window."
-msgstr "ëì ìì êë ìë ìí."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "Default window X coordinate"
-msgstr "êë ì êë ìí"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "The default X coordinate for the main window."
-msgstr "ëì ìì êë êë ìí."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "Default window width"
-msgstr "êë ì ëë"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "The default width for the main window, in pixels."
-msgstr "ëì ìì êë ëë, íì ëì."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "Default window height"
-msgstr "êë ì ëì"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "The default height for the main window, in pixels."
-msgstr "ëì ìì êë ëì, íì ëì."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Default window state"
-msgstr "êë ì ìí"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Whether or not the window should be maximized."
-msgstr "ìì ìëííì ìë."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-msgid "Proxy configuration mode"
-msgstr "íëì ìì ëë"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-"íëì ìì ëëë ìííëë. ììíë êì 0, 1, 2, 3ìê, êêì ìëë "
-"\"ììí ìì ìì\", \"íëì ìì\", \"ìë íëì ìì ìì\", \"ìë ì"
-"ì URLì ëì ìë íëì ìì ìì\"ìëë."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "HTTP proxy port"
-msgstr "HTTP íëì íí"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"íëìë ììí \"/apps/evolution/shell/network_config/http_host\"ìì ìì"
-"í ìííì íí."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "HTTP proxy host name"
-msgstr "HTTP íëì íìí ìë"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The machine name to proxy HTTP through."
-msgstr "HTTP íëìë ììí ìíí ìë."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "Secure HTTP proxy port"
-msgstr "ëì HTTP íëì íí"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"íëìë ììí \"/apps/evolution/shell/network_config/secure_host\"ìì ìì"
-"í ìííì íí."
+msgstr "CSV íìì êê ìì(_D)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "Secure HTTP proxy host name"
-msgstr "ëì HTTP íëì íìí ìë"
+#: ../plugins/save-calendar/csv-format.c:570
+msgid "Prepend a _header"
+msgstr "ìì íë ëì(_H)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy secure HTTP through."
-msgstr "ëì HTTP íëìë ììí ìíí ìë."
+#: ../plugins/save-calendar/csv-format.c:579
+msgid "_Value delimiter:"
+msgstr "ê êë(_V):"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid "SOCKS proxy port"
-msgstr "SOCKS íëì íí"
+#: ../plugins/save-calendar/csv-format.c:590
+msgid "_Record delimiter:"
+msgstr "ëìë êë(_R):"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"íëìë ììí \"/apps/evolution/shell/network_config/socks_host\"ìì ìì"
-"í ìííì íí."
+#: ../plugins/save-calendar/csv-format.c:601
+msgid "_Encapsulate values with:"
+msgstr "êì ëëìë ëì(_E):"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid "SOCKS proxy host name"
-msgstr "SOCKS íëì íìí ìë"
+#: ../plugins/save-calendar/csv-format.c:627
+msgid "Comma separated values (.csv)"
+msgstr "ìëë êëí ê (.csv)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid "The machine name to proxy socks through."
-msgstr "SOCKS íëìë ììí ìíí ìë."
+#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:199
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Use HTTP proxy"
-msgstr "HTTP íëì ìì"
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr "ìíí ìí ìì"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "ìíëì íí HTTP ë ëì HTTPë ììí ë íëì ììì ììíëë."
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+msgid "Save a calendar or task list to disk."
+msgstr "ëëìë ìì ëëì ëìíì ììíëë."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "Authenticate proxy server connections"
-msgstr "íëì ìë ìê ììíê"
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * 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:146
+msgid "%FT%T"
+msgstr "%FT%T"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"ììë íëì ìëì ìêí ë ììì íìíëë. ììì ìëê ìíë \"/"
-"apps/evolution/shell/network_config/authentication_user\" gconf íìì ììí"
-"ê, ìíë gnome-keyringìë .gnome2_private/Evolution ìí íììì êììë"
-"ë."
+#: ../plugins/save-calendar/rdf-format.c:377
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
-msgid "HTTP proxy username"
-msgstr "HTTP íëì ììì ìë"
+#: ../plugins/save-calendar/save-calendar.c:123
+msgid "_Format:"
+msgstr "íì(_F):"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Username to pass as authentication when doing HTTP proxying."
-msgstr "HTTP íëìì ììí ë ëê ììì ìë."
+#: ../plugins/save-calendar/save-calendar.c:185
+msgid "Select destination file"
+msgstr "ëì íì ìí"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "HTTP proxy password"
-msgstr "HTTP íëì ìí"
+#: ../plugins/save-calendar/save-calendar.c:340
+msgid "Save the selected calendar to disk"
+msgstr "ìíí ëëì ëìíì ììíëë"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "HTTP íëìì ììí ë ëê ìí."
+#: ../plugins/save-calendar/save-calendar.c:371
+msgid "Save the selected memo list to disk"
+msgstr "ìíí ëë ëëì ëìíì ììíëë"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Non-proxy hosts"
-msgstr "íëì ìì íìí"
+#: ../plugins/save-calendar/save-calendar.c:402
+msgid "Save the selected task list to disk"
+msgstr "ìíí ìì ëëì ëìíì ììíëë"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+"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 ""
-"ì íìë íëìë ììíì ìê (íëìê ìëëë) ìì ìêí íìíì ë"
-"ëì ëì ììëë. ì êìë íìí ìë, ëëì(*.foo.comê êì ìì ìì"
-"ëìë ìì), IP ìì(IPv4ì IPv6 ëë êë), ëíëìíë ììí ëíìí ì"
-"ì(192.168.0.0/24ì êì) ëë ììí ì ììëë."
+"ìì íëêìì ììí ìì. $ORIG[subject], $ORIG[from], $ORIG[to], $ORIG"
+"[body] ëìì ëìë ììíëë. ì ëìë ëìíë ëì êì ëì ìë êì"
+"ë ëëëë."
+
+#: ../plugins/templates/templates.c:1112
+msgid "No Title"
+msgstr "ìë ìì"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid "Automatic proxy configuration URL"
-msgstr "ìë íëì ìì URL"
+#: ../plugins/templates/templates.c:1221
+msgid "Save as _Template"
+msgstr "ìììë ìì(_T)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "URL that provides proxy configuration values."
-msgstr "íëì ìì êì ëì ìë URL."
+#: ../plugins/templates/templates.c:1223
+msgid "Save as Template"
+msgstr "ìììë ìì"
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../shell/e-shell.c:312
+#: ../shell/e-shell.c:313
 msgid "Preparing to go offline..."
 msgstr "ìê ìì ìíë ìëíë ìë ì..."
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../shell/e-shell.c:365
+#: ../shell/e-shell.c:366
 msgid "Preparing to go online..."
 msgstr "ìê ìíë ìëíë ìë ì..."
 
 # ìì: ëë ëììì ìëë ììë. ëììë ëìíì ë ê.
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:437
 msgid "Preparing to quit..."
 msgstr "ëë ìë ì..."
 
@@ -20376,326 +18988,317 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "ëë íì (*)"
 
-#: ../shell/e-shell-view.c:303
+#: ../shell/e-shell-view.c:304
 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:645
+#: ../shell/e-shell-window-actions.c:642
 msgid "translator-credits"
 msgstr "GNOME Korea <gnome-kr googlegroups com>"
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:653
 msgid "Evolution Website"
 msgstr "ìëëì ìììí"
 
-#: ../shell/e-shell-window-actions.c:914
+#: ../shell/e-shell-window-actions.c:891
 msgid "Categories Editor"
 msgstr "ëë íì"
 
-#: ../shell/e-shell-window-actions.c:1249
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "ëêëëë ììíì ìììëë."
 
-#: ../shell/e-shell-window-actions.c:1251
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "ëêëëë ìíí ì ììëë."
 
-#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1411
 msgid "Show information about Evolution"
 msgstr "ìëëìì ëí ìëë íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1437
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1416
+#: ../shell/e-shell-window-actions.c:1430
 msgid "_Close Window"
 msgstr "ì ëê(_C)"
 
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Contents"
 msgstr "ìë(_C)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Open the Evolution User Guide"
 msgstr "ìëëì ììì ìëìë ìëë"
 
-#: ../shell/e-shell-window-actions.c:1486
-msgid "_Forget Passwords"
-msgstr "ììí ìí ìêí(_F)"
-
-# tooltip
-#: ../shell/e-shell-window-actions.c:1488
-msgid "Forget all remembered passwords"
-msgstr "ììí ëë ìíë ìêííëë"
-
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1465
 msgid "I_mport..."
 msgstr "êììê(_M)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1467
 msgid "Import data from other programs"
 msgstr "ëë íëêëìì ëìíë êììëë"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1472
 msgid "New _Window"
 msgstr "ì ì(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Create a new window displaying this view"
 msgstr "ì ëë ì ìì ëëëë"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1486
 msgid "Available Cate_gories"
 msgstr "ìì êëí ëë(_G)"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Manage available categories"
 msgstr "ìì êëí ëëë êëíëë"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1500
 msgid "_Quick Reference"
 msgstr "ìì ìì ëì(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Show Evolution's shortcut keys"
 msgstr "ìëëì ëë êê íë íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Exit the program"
 msgstr "íëêëì ëëëë"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Advanced Search..."
 msgstr "êê êì(_A)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Construct a more advanced search"
 msgstr "ë ëìí êê êìì ìííëë"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Clear the current search parameters"
 msgstr "íì êì íëëíë ììëë"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Edit Saved Searches..."
 msgstr "ììí êì íì(_E)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Manage your saved searches"
 msgstr "ììí êìì êëíëë"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Click here to change the search type"
 msgstr "êì ìëë ëêëë ìêë ëëììì"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Find Now"
 msgstr "ìê ìê(_F)"
 
 # tooltip
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Execute the current search parameters"
 msgstr "íì êì íëëíë ìííëë"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Save Search..."
 msgstr "êì ìì(_S)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Save the current search parameters"
 msgstr "íì êì íëëíë ììíëë"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1563
 msgid "Submit _Bug Report..."
 msgstr "ëê ìë(_B)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ëêëëë ëêìëë íëë"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Work Offline"
 msgstr "ìê ìì ìí ìì(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Put Evolution into offline mode"
 msgstr "ìëëìì ìê ìì ìíë ëêëë"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1577
 msgid "_Work Online"
 msgstr "ìê ìí ìì(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Put Evolution into online mode"
 msgstr "ìëëìì ìê ìíë ëêëë"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Lay_out"
 msgstr "ëì(_O)"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1614
 msgid "_New"
 msgstr "ìë ëëê(_N)"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Search"
 msgstr "êì(_S)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1628
 msgid "_Switcher Appearance"
 msgstr "ìí ëì ëì(_S)"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Window"
 msgstr "ì(_W)"
 
-#: ../shell/e-shell-window-actions.c:1699
+#: ../shell/e-shell-window-actions.c:1671
 msgid "Show Side _Bar"
 msgstr "ëì ëì ëìê(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1673
 msgid "Show the side bar"
 msgstr "ëì ëìì íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1707
+#: ../shell/e-shell-window-actions.c:1679
 msgid "Show _Buttons"
 msgstr "ëì ëìê(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1681
 msgid "Show the switcher buttons"
 msgstr "ìí ëìë íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show _Status Bar"
 msgstr "ìí íìì ëê(_S)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the status bar"
 msgstr "ìí íììì íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Tool Bar"
 msgstr "ëê ëì ëìê(_T)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1725
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the tool bar"
 msgstr "ëê ëìì íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1719
 msgid "_Icons Only"
 msgstr "ìììë(_I)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1721
 msgid "Display window buttons with icons only"
 msgstr "ìììë ììí ì ëìë íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1726
 msgid "_Text Only"
 msgstr "íìíë(_T)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Display window buttons with text only"
 msgstr "íìíë ììí ì ëìë íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1733
 msgid "Icons _and Text"
 msgstr "ììì ë íìí(_A)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1735
 msgid "Display window buttons with icons and text"
 msgstr "ìììê íìíë ììí ì ëìë íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1740
 msgid "Tool_bar Style"
 msgstr "ëê ëì ëì(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1742
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ëìíí ëê ëì ììì ììí ì ëìë íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Define Views..."
 msgstr "ëê ìì..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1780
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Create or edit views"
 msgstr "ëêë ëëêë íìíëë"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Save Custom View..."
 msgstr "ììì ëê ìì..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1759
 msgid "Save current custom view"
 msgstr "íì ììì ìì ëë ììíëë"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1766
 msgid "C_urrent View"
 msgstr "íì ëê(_U)"
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1776
 msgid "Custom View"
 msgstr "ììì ëê"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1806
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Current view is a customized view"
 msgstr "íì ëë ììì ìì ëìëë"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1816
+#: ../shell/e-shell-window-actions.c:1788
 msgid "Change the page settings for your current printer"
 msgstr "íì íëíì íìì ììì ëêëë"
 
-#: ../shell/e-shell-window-actions.c:2206
+#: ../shell/e-shell-window-actions.c:2178
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ììë ëêê"
 
-#: ../shell/e-shell-window-actions.c:2327
+#: ../shell/e-shell-window-actions.c:2299
 #, c-format
 msgid "Select view: %s"
 msgstr "ë ìí: %s"
 
-#: ../shell/e-shell-window-actions.c:2428
+#: ../shell/e-shell-window-actions.c:2400
 msgid "Execute these search parameters"
 msgstr "ì êì íëëíë ìííëë"
 
-#: ../shell/e-shell-window.c:494
+#: ../shell/e-shell-window.c:497
 msgid "New"
 msgstr "ìë ëëê"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:577
+#: ../shell/e-shell-window-private.c:585
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - ìëëì"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:184
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20729,7 +19332,7 @@ msgstr ""
 "ìëê ììí ìí êêëì ì ì ììê ëëëë. êëê êëì\n"
 "êìí ììêë ëì ëìê êëëêìëë!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:208
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20737,13 +19340,13 @@ msgstr ""
 "êëìëë\n"
 "ìëëì í\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:214
 msgid "Do not tell me again"
 msgstr "ëì ìëì ìê"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:310
+#: ../shell/main.c:305
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20751,47 +19354,47 @@ msgstr ""
 "ìëëìì ììí ë ììí ìíëíë íì, ìì êëí íëì 'mail', "
 "'calendar', 'contacts', 'tasks', 'memos'"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:309
 msgid "Apply the given geometry to the main window"
 msgstr "íë íêì ììë ëì ìì ììíëë"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:313
 msgid "Start in online mode"
 msgstr "ìê ìíìì ììíëë"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:315
 msgid "Ignore network availability"
 msgstr "ëíìí ìì êë ìëë ëìíëë"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:317
 msgid "Start in \"express\" mode"
 msgstr "\"êì\" ëëìì ììíëë"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:320
 msgid "Forcibly shut down Evolution"
 msgstr "êìë ìëëìì ëëëë"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:323
 msgid "Disable loading of any plugins."
 msgstr "íëêìì ìëêë ììëìì ììëë."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:325
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ììëì, ìëì, ììì ëë ëê ìì ììíì ììëë."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:329
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "ëì ììì ì URIì íì ìëì êììëë."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:331
 msgid "Request a running Evolution process to quit"
 msgstr "ìí ìì ìëëì íëììì ëëë ììì íëë"
 
-#: ../shell/main.c:510 ../shell/main.c:518
+#: ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ìëëì êììë êë ë ëì íëììí"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:569
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20800,7 +19403,7 @@ msgstr ""
 "%s: --onlineê --offline ììì êì ì ì ììëë\n"
 "  ììí ìëë ëëë '%s --help' ëëì ìííììì.\n"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:575
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20846,40 +19449,6 @@ msgstr ""
 "ëì 2ë ëì ìêëìëí ëìì, ëì ëì 3ìë ìêëìëí ìë ììë"
 "ë."
 
-#: ../shell/shell.error.xml.h:11
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "ìëë ììíë ëë ìíë ìêííìêìëê?"
-
-#: ../shell/shell.error.xml.h:12
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"ìíë ìêííë ììíë ëë ìíë ììëë. ëìì ìíê íìí ë ë"
-"ì ëìëê ëëë."
-
-#: ../shell/shell.error.xml.h:13
-msgid "_Forget"
-msgstr "ìí ìêí(_F)"
-
-#: ../shell/test/e-test-shell-backend.c:52
-msgctxt "New"
-msgid "_Test Item"
-msgstr "íìí íë(_T)"
-
-#: ../shell/test/e-test-shell-backend.c:54
-msgid "Create a new test item"
-msgstr "ì íìí íëì ëëëë"
-
-#: ../shell/test/e-test-shell-backend.c:62
-msgctxt "New"
-msgid "Test _Source"
-msgstr "íìí ìì(_S)"
-
-#: ../shell/test/e-test-shell-backend.c:64
-msgid "Create a new test source"
-msgstr "ì íìí ììë ëëëë"
-
 #: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
@@ -20970,7 +19539,7 @@ msgstr "ëê ëì êê êë"
 #: ../smime/gui/certificate-manager.c:80
 #: ../smime/gui/certificate-manager.c:100
 #: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
-#: ../smime/lib/e-cert.c:543
+#: ../smime/lib/e-cert.c:542
 msgid "Serial Number"
 msgstr "ìë ëí"
 
@@ -21027,27 +19596,27 @@ msgstr "MD5 íêíëí"
 msgid "Email Address"
 msgstr "ììëì ìì"
 
-#: ../smime/gui/certificate-manager.c:584
+#: ../smime/gui/certificate-manager.c:589
 msgid "Select a certificate to import..."
 msgstr "êìì ìììë ìííììì..."
 
-#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:602
 msgid "All files"
 msgstr "ëë íì"
 
-#: ../smime/gui/certificate-manager.c:632
+#: ../smime/gui/certificate-manager.c:637
 msgid "Failed to import certificate"
 msgstr "ìììë êììëë ìííìëë"
 
-#: ../smime/gui/certificate-manager.c:1006
+#: ../smime/gui/certificate-manager.c:1013
 msgid "All PKCS12 files"
 msgstr "ëë PKCS12 íì"
 
-#: ../smime/gui/certificate-manager.c:1023
+#: ../smime/gui/certificate-manager.c:1030
 msgid "All email certificate files"
 msgstr "ëë ììëì ìì íì"
 
-#: ../smime/gui/certificate-manager.c:1040
+#: ../smime/gui/certificate-manager.c:1047
 msgid "All CA certificate files"
 msgstr "ëë CA ììì íì"
 
@@ -21111,11 +19680,11 @@ msgstr ""
 msgid "Select certificate"
 msgstr "ììì ìí"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:803
+#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "SSL íëììí ììì"
 
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:807
+#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "SSL ìë ììì"
 
@@ -21137,15 +19706,15 @@ msgstr "ëê ëì:"
 
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "Common Name (CN)"
-msgstr "êí ìë (CN)"
+msgstr "êí ìë(CN)"
 
 #: ../smime/gui/smime-ui.ui.h:10
 msgid "Organization (O)"
-msgstr "ìì (Organization, O)"
+msgstr "ìì(Organization, O)"
 
 #: ../smime/gui/smime-ui.ui.h:11
 msgid "Organizational Unit (OU)"
-msgstr "ìì êë (Organizational Unit, OU)"
+msgstr "ìì êë(Organizational Unit, OU)"
 
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Issued On"
@@ -21180,6 +19749,10 @@ msgstr "ììì íë"
 msgid "Field Value"
 msgstr "íë ê"
 
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Details"
+msgstr "ììí"
+
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "You have certificates from these organizations that identify you:"
 msgstr "ì ìì êêìì ëë íìí ì ìë ìììë êìê ììëë:"
@@ -21241,11 +19814,9 @@ msgstr "ìííìì êëìë íìí ë ì ììêê ìë(_S)"
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
-msgstr ""
-"ìë ëììë ì ììêêì ìëíê ìì, ê ìììì ììê (ìëë) íëì"
-"ìë íìíì íëë."
+msgstr "ìë ëììë ì ììêêì ìëíê ìì, ê ìììì ììê íëììë(ìë êì) íìíì íëë."
 
-#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1072
+#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "ììì"
 
@@ -21269,153 +19840,153 @@ msgstr "ì ìììê ëìë í ì ìëíì ìì"
 msgid "_Edit CA Trust"
 msgstr "ìì êê ìëìì íì(_E)"
 
-#: ../smime/lib/e-cert.c:202 ../smime/lib/e-cert.c:214
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:391
+#: ../smime/lib/e-cert.c:390
 msgid "Sign"
 msgstr "ìë"
 
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:391
 msgid "Encrypt"
 msgstr "ìíí"
 
-#: ../smime/lib/e-cert.c:504
+#: ../smime/lib/e-cert.c:503
 msgid "Version"
 msgstr "ëì"
 
-#: ../smime/lib/e-cert.c:519
+#: ../smime/lib/e-cert.c:518
 msgid "Version 1"
 msgstr "ëì 1"
 
-#: ../smime/lib/e-cert.c:522
+#: ../smime/lib/e-cert.c:521
 msgid "Version 2"
 msgstr "ëì 2"
 
-#: ../smime/lib/e-cert.c:525
+#: ../smime/lib/e-cert.c:524
 msgid "Version 3"
 msgstr "ëì 3"
 
-#: ../smime/lib/e-cert.c:608
+#: ../smime/lib/e-cert.c:607
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2, RSA ìíí"
 
-#: ../smime/lib/e-cert.c:611
+#: ../smime/lib/e-cert.c:610
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5, RSA ìíí"
 
-#: ../smime/lib/e-cert.c:614
+#: ../smime/lib/e-cert.c:613
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1, RSA ìíí"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256, RSA ìíí"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384, RSA ìíí"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512, RSA ìíí"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ìíí"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "ììì í ìë"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "ëìììí ììì íì"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "ìì êê í ID"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ìëìí ID (%s)"
 
-#: ../smime/lib/e-cert.c:723
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "ìêëì ID"
 
-#: ../smime/lib/e-cert.c:731
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "ìêëì ìì"
 
-#: ../smime/lib/e-cert.c:753
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "ììì êê í ìë"
 
-#: ../smime/lib/e-cert.c:758
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "ììì êê í ìêëì"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "ìììì êê í"
 
-#: ../smime/lib/e-cert.c:794 ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:843
 msgid "Error: Unable to process extension"
 msgstr "ìë: ìê íëì ìëí ì ììëë"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:827
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "ìëìí ìëì"
 
-#: ../smime/lib/e-cert.c:819
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL ìì êê"
 
-#: ../smime/lib/e-cert.c:823
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "ììëì ìì êê"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:851
 msgid "Signing"
 msgstr "ìë"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:855
 msgid "Non-repudiation"
 msgstr "êëí ì ìì"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:859
 msgid "Key Encipherment"
 msgstr "í ìíí"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:863
 msgid "Data Encipherment"
 msgstr "ëìí ìíí"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:867
 msgid "Key Agreement"
 msgstr "í êì"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:871
 msgid "Certificate Signer"
 msgstr "ììì ìëì"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:875
 msgid "CRL Signer"
 msgstr "CRL ìëì"
 
-#: ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:924
 msgid "Critical"
 msgstr "ììí"
 
-#: ../smime/lib/e-cert.c:927 ../smime/lib/e-cert.c:930
+#: ../smime/lib/e-cert.c:926 ../smime/lib/e-cert.c:929
 msgid "Not Critical"
 msgstr "ììíì ìì"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:950
 msgid "Extensions"
 msgstr "íì êë"
 
@@ -21427,44 +19998,44 @@ msgstr "íì êë"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1030
+#: ../smime/lib/e-cert.c:1029
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1086 ../smime/lib/e-cert.c:1209
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "ììì ìë ìêëì"
 
-#: ../smime/lib/e-cert.c:1095
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "ëêì"
 
-#: ../smime/lib/e-cert.c:1150
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "ëêì êì ID"
 
-#: ../smime/lib/e-cert.c:1169
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "ììì êì ID"
 
-#: ../smime/lib/e-cert.c:1215
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "ììì ìë ê"
 
-#: ../smime/lib/e-cert-db.c:859
+#: ../smime/lib/e-cert-db.c:860
 msgid "Certificate already exists"
 msgstr "ìììê ìë ììëë"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:200
 msgid "PKCS12 File Password"
 msgstr "PKCS12 íì ìí"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:201
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 íìì ìíë ìëíììì:"
 
-#: ../smime/lib/e-pkcs12.c:306
+#: ../smime/lib/e-pkcs12.c:307
 msgid "Imported Certificate"
 msgstr "êìì ììì"
 
@@ -21595,7 +20166,7 @@ msgstr "\"%s\"ì ëí ë ìì"
 msgid "Table"
 msgstr "ëí"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:289
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:288
 msgid "Save Current View"
 msgstr "íì ë ìì"
 
@@ -21623,17 +20194,17 @@ msgstr "ë ìë:"
 msgid "Type of View"
 msgstr "ë ìë"
 
-#: ../widgets/misc/ea-calendar-item.c:306
-#: ../widgets/misc/ea-calendar-item.c:315
+#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:317
 msgid "%d %B %Y"
 msgstr "%Yë %B %dì"
 
-#: ../widgets/misc/ea-calendar-item.c:318
+#: ../widgets/misc/ea-calendar-item.c:320
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "ëë: %sìì %sêì"
 
-#: ../widgets/misc/ea-calendar-item.c:354
+#: ../widgets/misc/ea-calendar-item.c:356
 msgid "evolution calendar item"
 msgstr "ìëëì ëë íë"
 
@@ -21641,58 +20212,68 @@ msgstr "ìëëì ëë íë"
 msgid "Close this message"
 msgstr "ì ëììë ëìëë"
 
+#: ../widgets/misc/e-attachment-bar.c:658
+#: ../widgets/misc/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "ììì ëê"
+
+#: ../widgets/misc/e-attachment-bar.c:660
+#: ../widgets/misc/e-attachment-paned.c:705
+msgid "List View"
+msgstr "ëë ëê"
+
 #. To Translators: This text is set as a description of an attached
 #. * 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:1000
+#: ../widgets/misc/e-attachment.c:966
 msgid "Attached message"
 msgstr "ìëí ëìì"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1811 ../widgets/misc/e-attachment.c:2349
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1854 ../widgets/misc/e-attachment.c:2651
+#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
 msgid "A load operation is already in progress"
 msgstr "ììëìê ëìì ìë ìí ììëë"
 
-#: ../widgets/misc/e-attachment.c:1862 ../widgets/misc/e-attachment.c:2659
+#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
 msgid "A save operation is already in progress"
 msgstr "ìì ëìì ìë ìí ììëë"
 
-#: ../widgets/misc/e-attachment.c:1954
+#: ../widgets/misc/e-attachment.c:1989
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s'ì(ë) ììëì ì ììëë"
 
-#: ../widgets/misc/e-attachment.c:1957
+#: ../widgets/misc/e-attachment.c:1992
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ìëë ììëì ì ììëë"
 
-#: ../widgets/misc/e-attachment.c:2230
+#: ../widgets/misc/e-attachment.c:2265
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s'ì(ë) ì ì ììëë"
 
-#: ../widgets/misc/e-attachment.c:2233
+#: ../widgets/misc/e-attachment.c:2268
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ìëë ì ì ììëë."
 
-#: ../widgets/misc/e-attachment.c:2667
+#: ../widgets/misc/e-attachment.c:2702
 msgid "Attachment contents not loaded"
 msgstr "ìë ëìì ììëìì ìììëë"
 
-#: ../widgets/misc/e-attachment.c:2743
+#: ../widgets/misc/e-attachment.c:2778
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s'ì(ë) ììí ì ììëë"
 
-#: ../widgets/misc/e-attachment.c:2746
+#: ../widgets/misc/e-attachment.c:2781
 #, c-format
 msgid "Could not save the attachment"
 msgstr "ìëë ììí ì ììëë"
@@ -21701,6 +20282,11 @@ msgstr "ìëë ììí ì ììëë"
 msgid "Attachment Properties"
 msgstr "ìë ìì"
 
+#: ../widgets/misc/e-attachment-dialog.c:333
+#: ../widgets/misc/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "íì ìë(_I):"
+
 #: ../widgets/misc/e-attachment-dialog.c:368
 msgid "MIME Type:"
 msgstr "MIME ìë:"
@@ -21801,20 +20387,90 @@ msgstr "\"%s\"ìì ìê"
 msgid "Open this attachment in %s"
 msgstr "ì ìëë \"%s\"ìì ìê"
 
+#: ../widgets/misc/e-book-source-config.c:98
+msgid "Mark as default address book"
+msgstr "êë ììëìë íì"
+
+#: ../widgets/misc/e-book-source-config.c:103
+msgid "Autocomplete with this address book"
+msgstr "ì ììëìë ìë ìì"
+
+#: ../widgets/misc/e-book-source-config.c:277
+msgid "Copy book content locally for offline operation"
+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:387
+#: ../widgets/misc/e-buffer-tagger.c:389
 msgid "Ctrl-click to open a link"
 msgstr "ëì ëíë ìëë Ctrlê ëìì ëìë ëëììì:"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:187
+msgid "Previous month"
+msgstr "ìì ë"
+
+#: ../widgets/misc/e-calendar.c:211
+msgid "Next month"
+msgstr "ëì ë"
+
+#: ../widgets/misc/e-calendar.c:233
+msgid "Previous year"
+msgstr "ìì ìë"
+
+#: ../widgets/misc/e-calendar.c:254
+msgid "Next year"
+msgstr "ëì ìë"
+
+#: ../widgets/misc/e-calendar.c:278
 msgid "Month Calendar"
 msgstr "ëë ëë"
 
+#. This is a strftime() format. %B = Month name.
+#: ../widgets/misc/e-calendar-item.c:1283
+#: ../widgets/misc/e-calendar-item.c:2136
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1285
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Yë"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1269
+#: ../widgets/misc/e-calendar-item.c:1322
+msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Yë %B"
 
+#: ../widgets/misc/e-cal-source-config.c:170
+msgid "Mark as default calendar"
+msgstr "êë ëëìë íì"
+
+#: ../widgets/misc/e-cal-source-config.c:173
+msgid "Mark as default task list"
+msgstr "êë ìì ëëìë íì"
+
+#: ../widgets/misc/e-cal-source-config.c:176
+msgid "Mark as default memo list"
+msgstr "êë ëë ëëìë íì"
+
+#: ../widgets/misc/e-cal-source-config.c:201
+msgid "Color:"
+msgstr "ì:"
+
+#: ../widgets/misc/e-cal-source-config.c:406
+msgid "Copy calendar contents locally for offline operation"
+msgstr "ìê ìì ìí ììì ìí ëë ëìì ëìì ëì"
+
+#: ../widgets/misc/e-cal-source-config.c:410
+msgid "Copy task list contents locally for offline operation"
+msgstr "ìê ìì ìí ììì ìí ìì ëë ëìì ëìì ëì"
+
+#: ../widgets/misc/e-cal-source-config.c:414
+msgid "Copy memo list contents locally for offline operation"
+msgstr "ìê ìì ìí ììì ìí ëë ëë ëìì ëìì ëì"
+
 #: ../widgets/misc/e-charset-combo-box.c:100
 msgid "Character Encoding"
 msgstr "ëì ììë"
@@ -21827,7 +20483,7 @@ msgstr "ììí ëìì ìëíììì"
 msgid "Other..."
 msgstr "ê ì..."
 
-#: ../widgets/misc/e-contact-map-window.c:359
+#: ../widgets/misc/e-contact-map-window.c:356
 msgid "Contacts Map"
 msgstr "ìëì ìë"
 
@@ -21863,16 +20519,16 @@ msgstr "ìì(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1694 ../widgets/misc/e-dateedit.c:1927
+#: ../widgets/misc/e-dateedit.c:1697 ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "ìì"
 
-#: ../widgets/misc/e-dateedit.c:1821
+#: ../widgets/misc/e-dateedit.c:1824
 msgid "Invalid Date Value"
 msgstr "ëì êì ìëëììëë"
 
-#: ../widgets/misc/e-dateedit.c:1865
+#: ../widgets/misc/e-dateedit.c:1868
 msgid "Invalid Time Value"
 msgstr "ìê êì ìëëììëë"
 
@@ -21977,6 +20633,59 @@ msgstr "íìì êëììì"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "ìëëììë íìì êììëë \"ìì\"ì ëëììì."
 
+#: ../widgets/misc/e-mail-signature-combo-box.c:378
+msgid "Autogenerated"
+msgstr "ìëìë ëëê"
+
+#: ../widgets/misc/e-mail-signature-editor.c:287
+msgid "Close"
+msgstr "ëê"
+
+#: ../widgets/misc/e-mail-signature-editor.c:292
+msgid "_Save and Close"
+msgstr "ìì í ëê(_S)"
+
+#: ../widgets/misc/e-mail-signature-editor.c:506
+msgid "Edit Signature"
+msgstr "ìë íì"
+
+#: ../widgets/misc/e-mail-signature-editor.c:526
+msgid "_Signature Name:"
+msgstr "ìë ìë(_S):"
+
+#: ../widgets/misc/e-mail-signature-editor.c:572
+msgid "Unnamed"
+msgstr "ìëìì"
+
+#: ../widgets/misc/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "ìíëí ìê(_S)"
+
+#: ../widgets/misc/e-mail-signature-manager.c:421
+msgid "Add Signature Script"
+msgstr "ìë ìíëí ìê"
+
+#: ../widgets/misc/e-mail-signature-manager.c:491
+msgid "Edit Signature Script"
+msgstr "ìë ìíëí íì"
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:395
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"ëì ìíëíì ìëì ìëìë ììíëë.\n"
+"ììíë ìëì íì ëììëë ììíëë."
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "ìíëí(_C):"
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "ìíëí íìì ìíí ì ììì íëë."
+
 #: ../widgets/misc/e-map.c:886
 msgid "World Map"
 msgstr "ìê ìë"
@@ -22009,48 +20718,48 @@ msgstr "ìëëìì íì ìê ìì ìíìëë. ëíìíë 
 msgid "Evolution Preferences"
 msgstr "ìëëì êë ìì"
 
-#: ../widgets/misc/e-search-bar.c:85
+#: ../widgets/misc/e-search-bar.c:79
 #, c-format
-msgid "Matches: %d"
-msgstr "ìì: %d"
+msgid "Matches: %u"
+msgstr "ìì: %u"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:527
 msgid "Close the find bar"
 msgstr "ì ìê ëìì ëìëë"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:535
 msgid "Fin_d:"
 msgstr "ìê(_D):"
 
-#: ../widgets/misc/e-search-bar.c:586
+#: ../widgets/misc/e-search-bar.c:547
 msgid "Clear the search"
 msgstr "êì êê ììê"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:571
 msgid "_Previous"
 msgstr "ìì(_P)"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Find the previous occurrence of the phrase"
 msgstr "ììì ìë íë ëêë ììëë"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:590
 msgid "_Next"
 msgstr "ëì(_N)"
 
-#: ../widgets/misc/e-search-bar.c:635
+#: ../widgets/misc/e-search-bar.c:596
 msgid "Find the next occurrence of the phrase"
 msgstr "ëìì ìë íë ëêë ììëë"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Mat_ch case"
 msgstr "ëìëì êë(_C)"
 
-#: ../widgets/misc/e-search-bar.c:676
+#: ../widgets/misc/e-search-bar.c:637
 msgid "Reached bottom of page, continued from top"
 msgstr "íìì ë ìëì ëìíìëë. ë ìëí êìíëë"
 
-#: ../widgets/misc/e-search-bar.c:698
+#: ../widgets/misc/e-search-bar.c:659
 msgid "Reached top of page, continued from bottom"
 msgstr "íìì ë ìì ëìíìëë. ë ìëëí êìíëë"
 
@@ -22198,105 +20907,140 @@ msgstr "ëì ëì ìë"
 msgid "Sta_tus Tracking"
 msgstr "ìí ìì(_T)"
 
-#: ../widgets/misc/e-signature-editor.c:142
-#: ../widgets/misc/e-signature-editor.c:567
-#: ../widgets/misc/e-signature-manager.c:376
-#: ../widgets/misc/e-signature-script-dialog.c:223
-msgid "Unnamed"
-msgstr "ìëìì"
+#: ../widgets/misc/e-source-config.c:675 ../widgets/misc/e-source-config.c:679
+msgid "Type:"
+msgstr "íí:"
 
-#: ../widgets/misc/e-signature-editor.c:218
-msgid "_Save and Close"
-msgstr "ìì í ëê(_S)"
+#: ../widgets/misc/e-source-config.c:687 ../widgets/misc/e-source-config.c:691
+msgid "Name:"
+msgstr "ìë:"
 
-#: ../widgets/misc/e-signature-editor.c:434
-msgid "Edit Signature"
-msgstr "ìë íì"
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../widgets/misc/e-source-config.c:1289
+msgid "Refresh every"
+msgstr "íë ìë êì ìê:"
 
-#: ../widgets/misc/e-signature-editor.c:449
-msgid "_Signature Name:"
-msgstr "ìë ìë(_S):"
+#: ../widgets/misc/e-source-config.c:1319
+#: ../widgets/misc/e-source-config.c:1347
+msgid "Use a secure connection"
+msgstr "ëì ìê ìì"
 
-#: ../widgets/misc/e-signature-manager.c:321
-msgid "Add Signature Script"
-msgstr "ìë ìíëí ìê"
+#: ../widgets/misc/e-source-config.c:1361
+msgid "Ignore invalid SSL certificate"
+msgstr "ìëë SSL ììì ëì"
 
-#: ../widgets/misc/e-signature-manager.c:386
-msgid "Edit Signature Script"
-msgstr "ìë ìíëí íì"
+#: ../widgets/misc/e-source-config.c:1398
+msgid "User"
+msgstr "ììì"
 
-#: ../widgets/misc/e-signature-manager.c:605
-msgid "Add _Script"
-msgstr "ìíëí ìê(_S)"
+#. no suggestions. Put something in the menu anyway...
+#: ../widgets/misc/e-spell-entry.c:351
+msgid "(no suggestions)"
+msgstr "(ìì ìì)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:270
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
-"ëì ìíëíì ìëì ìëìë ììíëë.\n"
-"ììíë ìëì íì ëììëë ììíëë."
+#: ../widgets/misc/e-spell-entry.c:375
+msgid "More..."
+msgstr "ë ëê..."
 
-#: ../widgets/misc/e-signature-script-dialog.c:315
-msgid "S_cript:"
-msgstr "ìíëí(_C):"
+#. + Add to Dictionary
+#: ../widgets/misc/e-spell-entry.c:444
+#, c-format
+msgid "Add \"%s\" to Dictionary"
+msgstr "ììì \"%s\" ìê"
 
-#: ../widgets/misc/e-signature-script-dialog.c:346
-msgid "Script file must be executable."
-msgstr "ìíëí íìì ìíí ì ììì íëë."
+#. - Ignore All
+#: ../widgets/misc/e-spell-entry.c:487
+msgid "Ignore All"
+msgstr "ëë ëì"
+
+#: ../widgets/misc/e-spell-entry.c:513
+msgid "Spelling Suggestions"
+msgstr "ëìë ìì"
 
 #: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "URLë êëë ìêë ëëììì"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:274 ../widgets/misc/e-web-view-gtkhtml.c:407
 msgid "_Copy Link Location"
 msgstr "ëí ìì ëì(_C)"
 
-#: ../widgets/misc/e-web-view.c:412
+#: ../widgets/misc/e-web-view.c:276 ../widgets/misc/e-web-view-gtkhtml.c:409
 msgid "Copy the link to the clipboard"
 msgstr "ëíë íëëëë ëìíëë"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:284 ../widgets/misc/e-web-view-gtkhtml.c:417
 msgid "_Open Link in Browser"
 msgstr "ëëìììì ëí ìê(_O)"
 
-#: ../widgets/misc/e-web-view.c:422
+#: ../widgets/misc/e-web-view.c:286 ../widgets/misc/e-web-view-gtkhtml.c:419
 msgid "Open the link in a web browser"
 msgstr "ì ëëìììì ëí ìê"
 
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:294 ../widgets/misc/e-web-view-gtkhtml.c:427
 msgid "_Copy Email Address"
 msgstr "ììëì ìì ëì(_C)"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
 msgid "_Copy Image"
 msgstr "êë ëì(_C)"
 
-#: ../widgets/misc/e-web-view.c:449
+#: ../widgets/misc/e-web-view.c:313 ../widgets/misc/e-web-view-gtkhtml.c:446
 msgid "Copy the image to the clipboard"
 msgstr "êëì íëëëë ëìíëë"
 
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+#: ../widgets/misc/e-web-view.c:333 ../widgets/misc/e-web-view.c:1440
+#: ../widgets/misc/e-web-view-gtkhtml.c:466
+#: ../widgets/misc/e-web-view-gtkhtml.c:1311
 msgid "Select all text and images"
 msgstr "ëë íìíì êëì ìííëë"
 
-#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
-#: ../widgets/misc/e-web-view.c:986
+#: ../widgets/misc/e-web-view.c:1104 ../widgets/misc/e-web-view.c:1106
+#: ../widgets/misc/e-web-view.c:1108 ../widgets/misc/e-web-view-gtkhtml.c:975
+#: ../widgets/misc/e-web-view-gtkhtml.c:977
+#: ../widgets/misc/e-web-view-gtkhtml.c:979
 #, c-format
 msgid "Click to call %s"
 msgstr "%sìê íìíëë ëëììì"
 
-#: ../widgets/misc/e-web-view.c:988
+#: ../widgets/misc/e-web-view.c:1110 ../widgets/misc/e-web-view-gtkhtml.c:981
 msgid "Click to hide/unhide addresses"
 msgstr "ììë êìëë/ëìëë ëëììì"
 
-#: ../widgets/misc/e-web-view.c:990
+#: ../widgets/misc/e-web-view.c:1112 ../widgets/misc/e-web-view-gtkhtml.c:983
 #, c-format
 msgid "Click to open %s"
 msgstr "%s URLì ìëë ëëììì"
 
+#: ../widgets/misc/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "ëë ëìì ììíìêìëê?"
+
+#: ../widgets/misc/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr "ìëì ëëììë, ììíì ìììëë."
+
+#: ../widgets/misc/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "ëë ëì ëëê(_D)"
+
+#: ../widgets/misc/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "ìë ìì"
+
+#: ../widgets/misc/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr "ì ìëì êëí ì ìë êìí ìëì ìëíììì."
+
+#: ../widgets/misc/widgets.error.xml.h:6
+msgid "Could not load signature."
+msgstr "ìëì ììëì ì ììëë."
+
+#: ../widgets/misc/widgets.error.xml.h:7
+msgid "Could not save signature."
+msgstr "ìëì ììí ì ììëë."
+
 #: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "íì ëë"
@@ -22325,7 +21069,7 @@ msgstr "ìêì ëìê êì íìììì íëë: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "íìí êì 0ê 100ì íííì ê ìììì íëë."
 
-#: ../widgets/table/e-table-click-to-add.c:610
+#: ../widgets/table/e-table-click-to-add.c:609
 #: ../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"
@@ -22438,7 +21182,7 @@ msgstr "ëìê(_G)..."
 msgid "_Fields Shown..."
 msgstr "íìí íë(_F)..."
 
-#: ../widgets/table/e-table-field-chooser.c:153
+#: ../widgets/table/e-table-field-chooser.c:152
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22457,7 +21201,7 @@ msgstr "ì ìê"
 #. * Finally the %d is replaced with count of items in this group.
 #. * Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:361
+#: ../widgets/table/e-table-group-container.c:360
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -22469,7 +21213,7 @@ msgstr[0] "%s : %s (%dê íë)"
 #. * The %d is replaced with count of items in this group.
 #. * Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:373
+#: ../widgets/table/e-table-group-container.c:372
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -22481,7 +21225,7 @@ msgstr "íì ë ììì ììíê"
 
 #: ../widgets/table/e-table-header-item.c:1596
 msgid "Sort _Ascending"
-msgstr "ìëìì ìë (_A)"
+msgstr "ìëìì ìë(_A)"
 
 #: ../widgets/table/e-table-header-item.c:1599
 msgid "Sort _Descending"
@@ -22564,10 +21308,10 @@ msgstr "ëëê"
 msgid "sort"
 msgstr "ìë"
 
-#: ../widgets/text/e-text.c:2338
+#: ../widgets/text/e-text.c:2074
 msgid "Select All"
 msgstr "ëë ìí"
 
-#: ../widgets/text/e-text.c:2351
+#: ../widgets/text/e-text.c:2087
 msgid "Input Methods"
 msgstr "ìëê"



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