[evolution] Updated Japanese translation



commit f4eeac9d196423591309b872672657c1e4902d70
Author: OKANO Takayoshi <kano na rim or jp>
Date:   Sat Aug 27 14:17:03 2011 +0900

    Updated Japanese translation

 po/ja.po | 4936 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 2552 insertions(+), 2384 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 12fa436..fd9300e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -15,14 +15,14 @@ msgstr ""
 "Project-Id-Version: evolution gnome-3-0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-07-12 12:51+0000\n"
-"PO-Revision-Date: 2011-07-12 23:29+0900\n"
-"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
+"POT-Creation-Date: 2011-08-26 12:57+0000\n"
+"PO-Revision-Date: 2011-08-27 14:21+0900\n"
+"Last-Translator: OKANO Takayoshi <kano na rim or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -248,7 +248,7 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Evolution ãåèåããããã{0}ãéçåãåçãããããã"
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:604
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:608
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "èåãã(_A)"
@@ -270,7 +270,7 @@ msgid "_Use as it is"
 msgstr "ããããäã(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:706
+#: ../addressbook/gui/widgets/eab-contact-display.c:710
 #: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "èåæ"
@@ -281,7 +281,7 @@ msgstr "èåæ"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:705
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
 #: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
 #: ../shell/main.c:140
 msgid "Birthday"
@@ -293,7 +293,7 @@ msgid "Blog:"
 msgstr "ããã:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "ãããã(_T)..."
@@ -308,18 +308,18 @@ msgid "Contact"
 msgstr "éçå"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:646
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2865
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:653
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:675
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2910
 msgid "Contact Editor"
 msgstr "éçåãããã"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:358
+#: ../addressbook/gui/merging/eab-contact-merging.c:382
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
-#: ../addressbook/gui/widgets/eab-contact-display.c:1000
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
 #: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-ããã"
@@ -335,7 +335,7 @@ msgstr "æå(_N)..."
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:198
 #: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1302
+#: ../addressbook/gui/widgets/eab-contact-display.c:1306
 #: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "èå"
@@ -370,14 +370,13 @@ msgid "Nic_kname:"
 msgstr "ããå(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:265
 msgid "Notes"
 msgstr "æé"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
 #: ../addressbook/gui/widgets/eab-contact-display.c:79
-#: ../addressbook/gui/widgets/eab-contact-display.c:403
+#: ../addressbook/gui/widgets/eab-contact-display.c:408
 #: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "ããä"
@@ -405,8 +404,8 @@ msgstr "ãããããããã"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
-#: ../addressbook/gui/widgets/eab-contact-display.c:1299
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:1303
 #: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "ää"
@@ -432,8 +431,8 @@ msgid "_Blog:"
 msgstr "ããã(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:708
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "ãããã(_C):"
@@ -513,47 +512,47 @@ msgid "_Zip/Postal Code:"
 msgstr "éäçå(_Z):"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:447
+#: ../addressbook/gui/widgets/eab-gui-util.c:451
 msgid "Error adding contact"
 msgstr "éçåãèåããéãããããççãããã"
 
@@ -565,21 +564,21 @@ msgstr "éçåãäæããéãããããççãããã"
 msgid "Error removing contact"
 msgstr "éçåãåéããéãããããççãããã"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:661
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2859
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:669
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2904
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "éçåãããã - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3383
 msgid "Please select an image for this contact"
 msgstr "ããéçåãçåãéæãããããã"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3302
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3384
 msgid "_No image"
 msgstr "çåãã(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -587,43 +586,43 @@ msgstr ""
 "éçåããããééããããã:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3719
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ãæåãééããããã"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3626
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ãæåãééããããã"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3638
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3649
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3754
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ãçãã"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3664
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3769
 msgid "Invalid contact."
 msgstr "éçåãæãããããããã"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:431
 msgid "Contact Quick-Add"
 msgstr "éçåãçæèå"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:414
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:434
 msgid "_Edit Full"
 msgstr "ãããçé(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:462
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:482
 msgid "_Full name"
 msgstr "æå(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:473
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:493
 msgid "E_mail"
 msgstr "E-ããã(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:484
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:504
 msgid "_Select Address Book"
 msgstr "ããããåãéæ(_S)"
 
@@ -693,7 +692,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:729
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:740
 msgid "Contact List Editor"
 msgstr "éçåãäèãããã"
 
@@ -710,7 +709,7 @@ msgid "_List name:"
 msgstr "äèãåå(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "éæ(_S)..."
 
@@ -720,23 +719,23 @@ msgstr ""
 "E-ãããããããããååããããéçåãäãäèãäããããããããããã"
 "(_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:852
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:863
 msgid "Contact List Members"
 msgstr "éçåãäèããããã"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1422
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1438
 msgid "Error adding list"
 msgstr "äèãèåããéãããããççãããã"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1437
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1453
 msgid "Error modifying list"
 msgstr "äèãäæããéãããããççãããã"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1452
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1468
 msgid "Error removing list"
 msgstr "äèãåéããéãããããççãããã"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1583
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1599
 msgid "_Members"
 msgstr "ãããã(_M)"
 
@@ -780,11 +779,11 @@ msgstr ""
 "æãããããããããããããããããèåãããã?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:304
+#: ../addressbook/gui/merging/eab-contact-merging.c:328
 msgid "_Merge"
 msgstr "ããããã(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:287
+#: ../addressbook/gui/merging/eab-contact-merging.c:311
 msgid "Merge Contact"
 msgstr "éçåãããã"
 
@@ -792,9 +791,9 @@ msgstr "éçåãããã"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:1059
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
-#: ../modules/calendar/e-memo-shell-view-actions.c:775
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Any field contains"
 msgstr "ãããããéçãæãåã"
 
@@ -808,21 +807,21 @@ msgstr "E-ããããæãåãã"
 msgid "Name contains"
 msgstr "æåãæãåã"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:155
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "éçåãã"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:159
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%dåãéçå"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:340
+#: ../addressbook/gui/widgets/e-addressbook-model.c:354
 msgid "Error getting book view"
 msgstr "ãããããããååãããããççãããã"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:751
+#: ../addressbook/gui/widgets/e-addressbook-model.c:768
 msgid "Search Interrupted"
 msgstr "æçãäæããããã"
 
@@ -851,34 +850,34 @@ msgstr "éæããéçåãåéããã"
 msgid "Select all visible contacts"
 msgstr "ããããèçãããããéçåãéæããã"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "ããããéçåãäèãæåãåéãããããããããã?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
 msgid "Are you sure you want to delete this contact list?"
 msgstr "ããéçåãäèãæåãåéãããããããããã?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1329
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "ããéçåãäè (%s) ãæåãåéãããããããããã?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 msgid "Are you sure you want to delete these contacts?"
 msgstr "ããããéçåãæåãåéãããããããããã?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
 msgid "Are you sure you want to delete this contact?"
 msgstr "ããéçåãæåãåéãããããããããã?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1343
 #, 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:1488
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -890,16 +889,16 @@ msgstr[0] ""
 "%d åãéçåã %d åãæããããããããéããããããããã\n"
 "æåãããããéçåããããèçãããããããããã?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1496
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1506
 msgid "_Don't Display"
 msgstr "èçããã(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1497
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1507
 msgid "Display _All Contacts"
 msgstr "ããããéçåãèç(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:677
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Assistant"
 msgstr "ãããããã"
 
@@ -928,7 +927,7 @@ msgid "Car Phone"
 msgstr "èèéè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -936,7 +935,7 @@ msgid "Categories"
 msgstr "ãããã"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:672
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Company"
 msgstr "äç"
 
@@ -985,22 +984,22 @@ msgid "Journal"
 msgstr "ããããã"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Manager"
 msgstr "ããããã"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:703
+#: ../addressbook/gui/widgets/eab-contact-display.c:707
 msgid "Mobile Phone"
 msgstr "æåéè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Nickname"
 msgstr "ããå"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:729
+#: ../addressbook/gui/widgets/eab-contact-display.c:733
 msgid "Note"
 msgstr "ããã"
 
@@ -1035,7 +1034,7 @@ msgid "Role"
 msgstr "åå"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:707
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Spouse"
 msgstr "éåè"
 
@@ -1177,17 +1176,17 @@ msgid "Copy _Email Address"
 msgstr "E-ãããããããããããã(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:184
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "ããããããããããããããããããã"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:189
-#: ../widgets/misc/e-web-view.c:435
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "æããããããããéä(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:191
-#: ../widgets/misc/e-web-view.c:437
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "ãããããããããããããããããéä"
 
@@ -1196,66 +1195,65 @@ msgstr "ãããããããããããããããããéä"
 msgid "Open map"
 msgstr "éã"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 #, fuzzy
 msgid "List Members:"
 msgstr "ããããããããå"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:673
+#: ../addressbook/gui/widgets/eab-contact-display.c:677
 msgid "Department"
 msgstr "æåéç"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:674
+#: ../addressbook/gui/widgets/eab-contact-display.c:678
 msgid "Profession"
 msgstr "åä"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:675
+#: ../addressbook/gui/widgets/eab-contact-display.c:679
 msgid "Position"
 msgstr "åè"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:678
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Video Chat"
 msgstr "ãããããããã"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:679
-#: ../calendar/gui/dialogs/calendar-setup.c:396
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
-#: ../modules/calendar/e-cal-shell-view.c:507
-#: ../modules/online-accounts/e-online-accounts-google.c:292
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../calendar/gui/dialogs/calendar-setup.c:437
+#: ../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:511
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "ãããã"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
-#: ../addressbook/gui/widgets/eab-contact-display.c:702
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:706
 msgid "Phone"
 msgstr "éè"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Fax"
 msgstr "FAX"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
-#: ../addressbook/gui/widgets/eab-contact-display.c:704
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Address"
 msgstr "äæ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
 msgid "Home Page"
 msgstr "ãããããã"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
 msgid "Web Log"
 msgstr "ããã"
 
@@ -1263,37 +1261,37 @@ msgstr "ããã"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
-#: ../capplet/settings/mail-capplet-shell.c:376
-#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../capplet/settings/mail-capplet-shell.c:380
+#: ../modules/addressbook/e-book-shell-backend.c:120
 #: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:138
 #: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:118
+#: ../modules/calendar/e-memo-shell-backend.c:122
 #: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:118
+#: ../modules/calendar/e-task-shell-backend.c:122
 #: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "ãããããã"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:967
+#: ../addressbook/gui/widgets/eab-contact-display.c:971
 msgid "List Members"
 msgstr "ããããããããå"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:985
+#: ../addressbook/gui/widgets/eab-contact-display.c:989
 msgid "Job Title"
 msgstr "ååå"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+#: ../addressbook/gui/widgets/eab-contact-display.c:1026
 msgid "Home page"
 msgstr "ãããããã"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../addressbook/gui/widgets/eab-contact-display.c:1035
 msgid "Blog"
 msgstr "ããã"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1229
-#: ../widgets/misc/e-web-view.c:954
+#: ../addressbook/gui/widgets/eab-contact-display.c:1233
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "ããããããã %s ããããããããã"
@@ -1397,19 +1395,19 @@ msgstr "ããããåãéæ"
 msgid "list"
 msgstr "äè"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:525
+#: ../addressbook/gui/widgets/eab-gui-util.c:533
 msgid "Move contact to"
 msgstr "éçåãçåå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:527
+#: ../addressbook/gui/widgets/eab-gui-util.c:535
 msgid "Copy contact to"
 msgstr "éçåããããå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:530
+#: ../addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Move contacts to"
 msgstr "èæãéçåãçåå"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:532
+#: ../addressbook/gui/widgets/eab-gui-util.c:540
 msgid "Copy contacts to"
 msgstr "èæãéçåããããå"
 
@@ -1417,44 +1415,44 @@ msgstr "èæãéçåããããå"
 msgid "Card View"
 msgstr "ãããèç"
 
-#: ../addressbook/importers/evolution-csv-importer.c:740
+#: ../addressbook/importers/evolution-csv-importer.c:741
 #: ../addressbook/importers/evolution-ldif-importer.c:539
 #: ../addressbook/importers/evolution-vcard-importer.c:282
-#: ../calendar/importers/icalendar-importer.c:380
-#: ../calendar/importers/icalendar-importer.c:847
-#: ../calendar/importers/icalendar-importer.c:877 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:401
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../calendar/importers/icalendar-importer.c:907 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ãããããä..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1041
+#: ../addressbook/importers/evolution-csv-importer.c:1040
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook ã CSV/Tab ãããã (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1042
+#: ../addressbook/importers/evolution-csv-importer.c:1041
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV/Tab ããããã"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1050
+#: ../addressbook/importers/evolution-csv-importer.c:1049
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla ã CSV/Tab ãããã (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1051
+#: ../addressbook/importers/evolution-csv-importer.c:1050
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV/Tab ããããã"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1059
+#: ../addressbook/importers/evolution-csv-importer.c:1058
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution ã CSV/Tab ãããã (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1060
+#: ../addressbook/importers/evolution-csv-importer.c:1059
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV/Tab ããããã"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:779
+#: ../addressbook/importers/evolution-ldif-importer.c:777
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ãããäæãããããã (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:780
+#: ../addressbook/importers/evolution-ldif-importer.c:778
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF ããããã"
 
@@ -1468,7 +1466,7 @@ msgstr "Evolution vCard ããããã"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:714
+#: ../addressbook/printing/e-contact-print.c:716
 #, c-format
 msgid "Page %d"
 msgstr "ããã %d"
@@ -1486,13 +1484,13 @@ msgstr "ããããåãäèãååãããããããã"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/event-page.c:2893
-#: ../calendar/gui/dialogs/memo-page.c:926
-#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2314
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:657
+#: ../calendar/gui/dialogs/event-page.c:2894
+#: ../calendar/gui/dialogs/memo-page.c:932
+#: ../calendar/gui/dialogs/task-page.c:1739 ../em-format/em-format.c:2316
+#: ../mail/em-folder-tree.c:695 ../mail/mail-ops.c:658
 #: ../plugins/caldav/caldav-browse-server.c:209
 #: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:313
+#: ../smime/gui/certificate-manager.c:312
 msgid "Unknown error"
 msgstr "ååäæãããã"
 
@@ -1951,7 +1949,7 @@ msgid "_Save Changes"
 msgstr "åæãäåãã(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "éäãã(_S)"
@@ -1974,7 +1972,7 @@ msgstr[0] "æé"
 #. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1189
 #, fuzzy
 msgid "day"
 msgid_plural "days"
@@ -1994,8 +1992,8 @@ msgstr "ãããåæ(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1734
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1744
 #: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Location:"
 msgstr "åæ:"
@@ -2017,7 +2015,7 @@ msgstr "åéç(_S)"
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
 #: ../plugins/google-account-setup/google-contacts-source.c:379
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 #, fuzzy
@@ -2045,32 +2043,34 @@ msgstr "äåãåæ"
 msgid "minutes"
 msgstr "å"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
 msgid "No summary available."
 msgstr "ãããããããããã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
 msgid "No description available."
 msgstr "èæããããããã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1545
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 msgid "No location information available."
 msgstr "åæãæåããããããã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
-#, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1649
+#, fuzzy, c-format
+#| msgid "You have %d alarm"
+#| msgid_plural "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
 msgstr[0] "%dåãããããããããã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1813
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1848
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1882
 msgid "Warning"
 msgstr "èå"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1784
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2082,7 +2082,7 @@ msgstr ""
 "ãèåãããããããããããäããã Evolution ã\n"
 "éåãããããããããããããèçãããã"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1819
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2099,7 +2099,7 @@ msgstr ""
 "\n"
 "æåããããããããããèåãããããããããã?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1834
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1903
 msgid "Do not ask me about this program again."
 msgstr "ããããããããäåãèçããã"
 
@@ -2175,7 +2175,7 @@ msgid "Classification"
 msgstr "åå"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:495
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "æå"
@@ -2207,7 +2207,7 @@ msgstr "ããã"
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "åæ"
 
@@ -2217,14 +2217,14 @@ msgid "Organizer"
 msgstr "äåè"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:767 ../calendar/gui/e-task-table.c:491
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "éåé"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:758 ../calendar/gui/e-cal-model.c:765
-#: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "åé"
 
@@ -2240,7 +2240,7 @@ msgstr "çãèã"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "ããã"
 
@@ -2270,8 +2270,10 @@ msgid "is not"
 msgstr "ãæãããã"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "ãããããçé"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Edit Reminder"
+msgstr "ããããããã!"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:438
@@ -2294,30 +2296,36 @@ msgid "Send an email"
 msgstr "E-ããããéäãã"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "ãããããèå"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Add Reminder"
+msgstr "ããããããã!"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "ãããã"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "ãããããããããããã(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+#, fuzzy
+#| msgid "Custom alarm sound"
+msgid "Custom reminder sound"
 msgstr "ããããéããããããããã"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "ããããã(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "ããããã"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Reminder"
+msgstr "ããããããã!"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "çãèã"
@@ -2339,7 +2347,9 @@ msgid "_Program:"
 msgstr "ããããã(_P):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
+#, fuzzy
+#| msgid "_Repeat the alarm"
+msgid "_Repeat the reminder"
 msgstr "ãããããçãèã(_R)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
@@ -2362,7 +2372,7 @@ msgstr "æ"
 msgid "end of appointment"
 msgstr "äåçä"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "å / "
@@ -2388,10 +2398,12 @@ msgid "A_dd"
 msgstr "èå(_D)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "ãããã"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Reminders"
+msgstr "ããããããã!"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
@@ -2402,7 +2414,7 @@ msgstr "çå:"
 msgid "_Type:"
 msgstr "çé(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:156
+#: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
@@ -2421,52 +2433,59 @@ msgstr "ãããããæãããããäèãååãããããããã
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ãããããæããããäèãååããããããããããã(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:372
+#: ../calendar/gui/dialogs/calendar-setup.c:340
+#, fuzzy
+#| msgid "Shared Folder Notification"
+msgid "Sh_ow reminder notifications"
+msgstr "åæãããããéç"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:413
 msgid "Colo_r:"
 msgstr "è(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:395
-#: ../calendar/gui/dialogs/calendar-setup.c:406
-#: ../calendar/gui/dialogs/calendar-setup.c:417
+#: ../calendar/gui/dialogs/calendar-setup.c:436
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../calendar/gui/dialogs/calendar-setup.c:459
 #: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
 #: ../modules/addressbook/addressbook-config.c:1052
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2960
+#: ../modules/addressbook/autocompletion-config.c:218
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3001
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "åè"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:407
+#: ../calendar/gui/dialogs/calendar-setup.c:449
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "ããããäè"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:418
+#: ../calendar/gui/dialogs/calendar-setup.c:460
 msgid "Memo List"
 msgstr "ãããäè"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:503
+#: ../calendar/gui/dialogs/calendar-setup.c:548
 msgid "Calendar Properties"
 msgstr "ãããããããããã"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:503
+#: ../calendar/gui/dialogs/calendar-setup.c:548
 msgid "New Calendar"
 msgstr "æãããããã"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:559
+#: ../calendar/gui/dialogs/calendar-setup.c:607
 msgid "Task List Properties"
 msgstr "ããããäèãããããã"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:559
+#: ../calendar/gui/dialogs/calendar-setup.c:607
 msgid "New Task List"
 msgstr "æããããããäè"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:615
+#: ../calendar/gui/dialogs/calendar-setup.c:666
 msgid "Memo List Properties"
 msgstr "ããããäèãããããã"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:615
+#: ../calendar/gui/dialogs/calendar-setup.c:666
 msgid "New Memo List"
 msgstr "æãããããäè"
 
@@ -2519,254 +2538,260 @@ msgstr "%s  äãåæãããããããããããããææããã
 msgid "Validation error: %s"
 msgstr "æåæãããã: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:267
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "æäãããããäåããããããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:611
 msgid "Could not update object"
 msgstr "ãããããããææãããããããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:715
+#: ../calendar/gui/dialogs/comp-editor.c:739
 msgid "Edit Appointment"
 msgstr "äåãçé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:722
+#: ../calendar/gui/dialogs/comp-editor.c:746
 #, c-format
 msgid "Meeting - %s"
 msgstr "äè - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:724
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Appointment - %s"
 msgstr "äå - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:730
+#: ../calendar/gui/dialogs/comp-editor.c:754
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ããããååã - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:732
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Task - %s"
 msgstr "ããã - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:737
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Memo - %s"
 msgstr "ãã - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:753
+#: ../calendar/gui/dialogs/comp-editor.c:777
 msgid "No Summary"
 msgstr "ãããçã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:874
+#: ../calendar/gui/dialogs/comp-editor.c:898
 msgid "Keep original item?"
 msgstr "ããããããããããããããããã?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
-msgid "Click here to close the current window"
-msgstr "ããããããããéããã"
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Close the current window"
+msgstr "çåããããããéããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:457 ../widgets/misc/e-web-view.c:1280
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "éæããéçå/äåããããããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../calendar/gui/dialogs/comp-editor.c:1113 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1274
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "éæããéçå/äåãåãåããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
-#: ../shell/e-shell-window-actions.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../shell/e-shell-window-actions.c:1469
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "éæãããããåé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-msgid "Click here to view help available"
-msgstr "åçåèãããããèçããã"
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+msgid "View help"
+msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1523
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1286
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "ããããããããèãäããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-msgid "Click here to save the current window"
-msgstr "ããååãäåããã"
+#: ../calendar/gui/dialogs/comp-editor.c:1155
+#, fuzzy
+#| msgid "Save Current View"
+msgid "Save current changes"
+msgstr "ããããããäå"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1162 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "ããããæååãéæããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Classification"
 msgstr "åå(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "çé(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "ãããã(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
-#: ../shell/e-shell-window-actions.c:1642
+#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "ããã(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1169
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 msgid "_Insert"
 msgstr "æä(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 #: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "ããããã(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1211 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "èç(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1193
+#: ../calendar/gui/dialogs/comp-editor.c:1221
 #: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "ãããããæä(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1195
-msgid "Click here to attach a file"
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
 msgstr "ãããããæäããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1203
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "_Categories"
 msgstr "ãããã(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1205
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "Toggles whether to display categories"
 msgstr "ãããããèç/éèçãåãæããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1211
+#: ../calendar/gui/dialogs/comp-editor.c:1239
 msgid "Time _Zone"
 msgstr "ãããããã(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Toggles whether the time zone is displayed"
 msgstr "ãããããããèç/éèçãåãæããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../calendar/gui/dialogs/comp-editor.c:1250
 msgid "Pu_blic"
 msgstr "åé(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Classify as public"
 msgstr "åéãããåé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1229
+#: ../calendar/gui/dialogs/comp-editor.c:1257
 msgid "_Private"
 msgstr "éåé(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "Classify as private"
 msgstr "éåéããããåé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1236
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "_Confidential"
 msgstr "æç(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Classify as confidential"
 msgstr "æçããããåé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1246
+#: ../calendar/gui/dialogs/comp-editor.c:1274
 msgid "R_ole Field"
 msgstr "åå(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1248
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Toggles whether the Role field is displayed"
 msgstr "ååãèç/éèçãåãæããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 msgid "_RSVP"
 msgstr "RSVP(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP ãèç/éèçãåãæããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "_Status Field"
 msgstr "ããããã(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "Toggles whether the Status field is displayed"
 msgstr "ããããããèç/éèçãåãæããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "_Type Field"
 msgstr "çé(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1272
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ååèãçéãèç/éèçãåãæããã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "æèéãããããããã(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2018
+#: ../calendar/gui/dialogs/comp-editor.c:2053
 #: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "æä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2354
-#: ../calendar/gui/dialogs/comp-editor.c:2517
-#: ../calendar/gui/dialogs/comp-editor.c:3495
+#: ../calendar/gui/dialogs/comp-editor.c:2389
+#: ../calendar/gui/dialogs/comp-editor.c:2552
+#: ../calendar/gui/dialogs/comp-editor.c:3533
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ææãåããããããããããåããåæãçæãã"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3459
+#: ../calendar/gui/dialogs/comp-editor.c:3497
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "æä"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3527
+#: ../calendar/gui/dialogs/comp-editor.c:3565
 msgid "Unable to use current version!"
 msgstr "çåãããããããäçããããã!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:111
 msgid "Could not open destination"
 msgstr "èéåããããéããããããã"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:123
+#: ../calendar/gui/dialogs/copy-source-dialog.c:127
 msgid "Destination is read only"
 msgstr "èéåãèãèãåç"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:157
+#: ../calendar/gui/dialogs/copy-source-dialog.c:161
 #, fuzzy
 msgid "Cannot create object"
 msgstr "æãããããããäæããããã"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:183
+#: ../calendar/gui/dialogs/copy-source-dialog.c:190
 msgid "Could not open source"
 msgstr "éäåããããéããããããã"
 
@@ -2855,11 +2880,15 @@ msgid "Enter Delegate"
 msgstr "åäåãåå"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "ãããã(_A)"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "_Reminders"
+msgstr "ããããããã!"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
+#, fuzzy
+#| msgid "Click here to set or unset alarms for this event"
+msgid "Set or unset reminders for this event"
 msgstr "ããããããããããããããããããèéããã"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
@@ -2904,12 +2933,12 @@ msgstr "Free/Busy(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "ããååèãäåãèããããã"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3185
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
 msgid "Appointment"
 msgstr "äå"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "ååè"
@@ -2918,76 +2947,78 @@ msgstr "ååè"
 msgid "Print this event"
 msgstr "ãããããããåå"
 
-#: ../calendar/gui/dialogs/event-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:558
 msgid "Event's start time is in the past"
 msgstr "ãããããéåæéãéåãã"
 
-#: ../calendar/gui/dialogs/event-page.c:633
+#: ../calendar/gui/dialogs/event-page.c:635
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ãããããçéããããããéæãããããããèãèãåçãã"
 
-#: ../calendar/gui/dialogs/event-page.c:637
+#: ../calendar/gui/dialogs/event-page.c:639
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "ãããããããããçéãããããããããããããããäåèããããããã"
 
-#: ../calendar/gui/dialogs/event-page.c:649
-#: ../calendar/gui/dialogs/event-page.c:3021
-msgid "This event has alarms"
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3049
+#, fuzzy
+#| msgid "This event has alarms"
+msgid "This event has reminders"
 msgstr "ããããããããããããéçããããã"
 
-#: ../calendar/gui/dialogs/event-page.c:716
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "äåè(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
+#: ../calendar/gui/dialogs/event-page.c:1262
 msgid "Event with no start date"
 msgstr "éåæããããããã"
 
-#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/event-page.c:1265
 msgid "Event with no end date"
 msgstr "çäæããããããã"
 
-#: ../calendar/gui/dialogs/event-page.c:1430
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:707
+#: ../calendar/gui/dialogs/task-page.c:819
 msgid "Start date is wrong"
 msgstr "éåæãééããããã"
 
-#: ../calendar/gui/dialogs/event-page.c:1440
+#: ../calendar/gui/dialogs/event-page.c:1448
 msgid "End date is wrong"
 msgstr "çäæãééããããã"
 
-#: ../calendar/gui/dialogs/event-page.c:1463
+#: ../calendar/gui/dialogs/event-page.c:1471
 msgid "Start time is wrong"
 msgstr "éåæåãééããããã"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/event-page.c:1478
 msgid "End time is wrong"
 msgstr "çäæåãééããããã"
 
-#: ../calendar/gui/dialogs/event-page.c:1635
-#: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1643
+#: ../calendar/gui/dialogs/memo-page.c:748
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "An organizer is required."
 msgstr "äåèãåèããã"
 
-#: ../calendar/gui/dialogs/event-page.c:1669
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:1677
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "At least one attendee is required."
 msgstr "æääåãååèãåèããã"
 
-#: ../calendar/gui/dialogs/event-page.c:1869
+#: ../calendar/gui/dialogs/event-page.c:1878
 msgid "_Delegatees"
 msgstr "åäè(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1871
+#: ../calendar/gui/dialogs/event-page.c:1880
 msgid "Atte_ndees"
 msgstr "ååè(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:2891
+#: ../calendar/gui/dialogs/event-page.c:2892
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "ãããã '%s' ãéããããã"
@@ -2998,76 +3029,82 @@ msgstr "ãããã '%s' ãéããããã"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2939
-#: ../calendar/gui/dialogs/memo-page.c:967
-#: ../calendar/gui/dialogs/task-page.c:1855
+#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/memo-page.c:1006
+#: ../calendar/gui/dialogs/task-page.c:1814
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "%s ãããäãããåçããããã"
 
-#: ../calendar/gui/dialogs/event-page.c:3250
+#: ../calendar/gui/dialogs/event-page.c:3278
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "äåã %dæå"
 
-#: ../calendar/gui/dialogs/event-page.c:3256
+#: ../calendar/gui/dialogs/event-page.c:3284
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "äåã %dæéå"
 
-#: ../calendar/gui/dialogs/event-page.c:3262
+#: ../calendar/gui/dialogs/event-page.c:3290
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "äåã %dåå"
 
-#: ../calendar/gui/dialogs/event-page.c:3281
+#: ../calendar/gui/dialogs/event-page.c:3309
 msgid "Customize"
 msgstr "ããä"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3287
-msgctxt "cal-alarms"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3315
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "ãã"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "ååè(_N)..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "ããããããããã:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#, fuzzy
+#| msgid "Custom Header"
+msgid "Custom Reminder:"
+msgstr "çèãããã"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "ãããããåå"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "ãããããã(_Z):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "ãããã(_A)"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "èæ(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "åæ(_L):"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#, fuzzy
+#| msgid "Reminder!"
+msgid "_Reminder"
+msgstr "ããããããã!"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "ããã(_S):"
@@ -3076,19 +3113,19 @@ msgstr "ããã(_S):"
 msgid "_Time:"
 msgstr "æå(_T):"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "äåã 1æå"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "äåã 1æéå"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3155,7 +3192,7 @@ msgid "Select Date"
 msgstr "æäãéæ"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Select _Today"
 msgstr "äæããã(_T)"
 
@@ -3163,7 +3200,7 @@ msgstr "äæããã(_T)"
 msgid "September"
 msgstr "9æ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
 msgid "Memo"
 msgstr "ãã"
 
@@ -3171,27 +3208,27 @@ msgstr "ãã"
 msgid "Print this memo"
 msgstr "ãããããåå"
 
-#: ../calendar/gui/dialogs/memo-page.c:393
+#: ../calendar/gui/dialogs/memo-page.c:405
 msgid "Memo's start date is in the past"
 msgstr "ãããéåæãéåãã"
 
-#: ../calendar/gui/dialogs/memo-page.c:430
+#: ../calendar/gui/dialogs/memo-page.c:442
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ãããçéããããããéæãããããèãèãåçãã"
 
-#: ../calendar/gui/dialogs/memo-page.c:434
+#: ../calendar/gui/dialogs/memo-page.c:446
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ãããããããçéãããããããããããããããäåèããããããã"
 
-#: ../calendar/gui/dialogs/memo-page.c:924
+#: ../calendar/gui/dialogs/memo-page.c:930
 #, fuzzy, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "'%s' ããããéããããã"
 
-#: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2563
-#: ../mail/em-format-html.c:2628 ../mail/em-format-html.c:2652
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1138 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2573
+#: ../mail/em-format-html.c:2638 ../mail/em-format-html.c:2662
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "åå"
 
@@ -3210,10 +3247,12 @@ msgid "T_o:"
 msgstr "åæå(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:331
+#: ../calendar/gui/dialogs/task-page.c:333
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "ãããã(_G):"
+#, fuzzy
+#| msgid "_Last:"
+msgid "_List:"
+msgstr "å(_L):"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
@@ -3251,21 +3290,21 @@ msgstr "ãããåæããããããã"
 msgid "All Instances"
 msgstr "ãããããããããã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ããäåãã Evolution ãçéããããçãèããããããã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:894
+#: ../calendar/gui/dialogs/recurrence-page.c:968
 msgid "Recurrence date is invalid"
 msgstr "çãèããæäãééããããã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 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:964
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "on"
 msgstr "ã"
 
@@ -3273,7 +3312,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:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1096
 msgid "first"
 msgstr "æåã"
 
@@ -3282,7 +3321,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:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1102
 msgid "second"
 msgstr "äççã"
 
@@ -3290,7 +3329,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:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1107
 msgid "third"
 msgstr "äççã"
 
@@ -3298,7 +3337,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:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 msgid "fourth"
 msgstr "åççã"
 
@@ -3306,7 +3345,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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 msgid "fifth"
 msgstr "äççã"
 
@@ -3314,13 +3353,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:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 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:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1146
 msgid "Other Date"
 msgstr "ããäãæ"
 
@@ -3328,7 +3367,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:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1152
 msgid "1st to 10th"
 msgstr "1æã10æ"
 
@@ -3336,7 +3375,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:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1158
 msgid "11th to 20th"
 msgstr "11æã20æ"
 
@@ -3344,41 +3383,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:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1164
 msgid "21st to 31st"
 msgstr "21æã31æ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "æææ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "çææ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "æææ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "æææ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "éææ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "åææ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "æææ"
@@ -3386,31 +3425,31 @@ msgstr "æææ"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1318
 msgid "on the"
 msgstr "ã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1492
 msgid "occurrences"
 msgstr "çãèã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2204
 msgid "Add exception"
 msgstr "åèåãæãèå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2245
 msgid "Could not get a selection to modify."
 msgstr "åæããååãååãããããããã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2175
+#: ../calendar/gui/dialogs/recurrence-page.c:2251
 msgid "Modify exception"
 msgstr "åèåãæãåæ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2219
+#: ../calendar/gui/dialogs/recurrence-page.c:2295
 msgid "Could not get a selection to delete."
 msgstr "åéããååãååãããããããã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2353
+#: ../calendar/gui/dialogs/recurrence-page.c:2429
 msgid "Date/Time"
 msgstr "æä/æå"
 
@@ -3473,7 +3512,9 @@ msgid "year(s)"
 msgstr "å"
 
 #: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
+#, fuzzy
+#| msgid "Send my alarms with this event"
+msgid "Send my reminders with this event"
 msgstr "ãããããããäçããããããéãã"
 
 #: ../calendar/gui/dialogs/send-comp.c:194
@@ -3491,11 +3532,11 @@ msgstr "ããããããã"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-component-preview.c:300
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3275 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:597
+#: ../calendar/gui/print.c:3274 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3503,47 +3544,47 @@ msgstr "ãããããæã"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3272
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-task-table.c:596 ../calendar/gui/print.c:3271
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 msgstr "åä"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "éã"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-component-preview.c:294
 #: ../calendar/gui/e-cal-model-tasks.c:435
 #: ../calendar/gui/e-cal-model-tasks.c:709
 #: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/print.c:3268
 msgid "In Progress"
 msgstr "éèä"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "äã"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1528 ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1533 ../calendar/gui/e-task-table.c:518
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
@@ -3551,11 +3592,11 @@ msgstr "æé"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-component-preview.c:304
 #: ../calendar/gui/e-cal-model-tasks.c:433
 #: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3266 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3265 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "éåããããã"
 
@@ -3581,7 +3622,7 @@ msgstr "çæ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "æåç"
@@ -3611,45 +3652,45 @@ msgstr "ããããèçãèçãããåæããã"
 msgid "_Send Options"
 msgstr "éäããããã(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3186
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "ããã"
 
-#: ../calendar/gui/dialogs/task-editor.c:322
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "ããããèç"
 
-#: ../calendar/gui/dialogs/task-editor.c:364
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
 msgstr "ããããããåå"
 
-#: ../calendar/gui/dialogs/task-page.c:249
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's start date is in the past"
 msgstr "ããããéåæãéåãã"
 
-#: ../calendar/gui/dialogs/task-page.c:250
+#: ../calendar/gui/dialogs/task-page.c:252
 msgid "Task's due date is in the past"
 msgstr "ããããææãéåãã"
 
-#: ../calendar/gui/dialogs/task-page.c:284
+#: ../calendar/gui/dialogs/task-page.c:286
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ããããååããçéããããããéæããããããäèãèãèãåçãã"
 
-#: ../calendar/gui/dialogs/task-page.c:288
+#: ../calendar/gui/dialogs/task-page.c:290
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ããããããããçéãããããããããããããããäåèããããããã"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:341
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "äåè(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:816
+#: ../calendar/gui/dialogs/task-page.c:801
 msgid "Due date is wrong"
 msgstr "ææãééããããã"
 
-#: ../calendar/gui/dialogs/task-page.c:1808
+#: ../calendar/gui/dialogs/task-page.c:1737
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "'%s' ãããããéããããã"
@@ -3740,49 +3781,49 @@ msgstr "%2$sãæçã%1$s"
 msgid "%s for an unknown trigger type"
 msgstr "ãããããçéãäæã %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:669
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:669
 msgid "Untitled"
 msgstr "ãããããã"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "ãããã:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "ããã:"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "éåæ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "ææ:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:290
 #: ../plugins/itip-formatter/itip-view.c:1076
 msgid "Status:"
 msgstr "ããããã:"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "ååå:"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "èæ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "ããããããã:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "äææ"
 
@@ -3802,12 +3843,12 @@ msgid "Start Date"
 msgstr "éåæ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:568
+#: ../calendar/gui/e-task-table.c:571
 msgid "Free"
 msgstr "äåãã"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:572
 msgid "Busy"
 msgstr "äåãã"
 
@@ -3827,39 +3868,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "ãã"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "ãã"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "ããã"
 
-#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
 #: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
 #: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:462
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2658
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model.c:1535
 msgid "Recurring"
 msgstr "çãèã"
 
-#: ../calendar/gui/e-cal-model.c:1532
+#: ../calendar/gui/e-cal-model.c:1537
 msgid "Assigned"
 msgstr "ååãæã"
 
-#: ../calendar/gui/e-cal-model.c:2714
+#: ../calendar/gui/e-cal-model.c:2811
 #, c-format
 msgid "Opening %s"
 msgstr "%s ãéããã"
@@ -3887,7 +3928,7 @@ msgstr "ææ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Priority"
 msgstr "ååå"
 
@@ -3924,22 +3965,22 @@ msgstr "éæãããããããåéããã"
 msgid "Deleting selected objects"
 msgstr "æåãããããããããåéããã"
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/e-task-table.c:1082
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-task-table.c:1094
 msgid "Updating objects"
 msgstr "ãããããããææ"
 
 #: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:213
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2605
+#: ../plugins/itip-formatter/itip-formatter.c:2646
 msgid "Accepted"
 msgstr "åèæ"
 
 #: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:214
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2611
+#: ../plugins/itip-formatter/itip-formatter.c:2652
 msgid "Declined"
 msgstr "èéæ"
 
@@ -3953,7 +3994,7 @@ msgstr "äæè"
 #: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:216
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2614
+#: ../plugins/itip-formatter/itip-formatter.c:2655
 msgid "Delegated"
 msgstr "åäæ"
 
@@ -3964,8 +4005,8 @@ msgstr "èããããã"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:537
-#: ../calendar/gui/e-task-table.c:758
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:761
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "äåè: %s <%s>"
@@ -3973,14 +4014,14 @@ 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:1930 ../calendar/gui/e-memo-table.c:542
-#: ../calendar/gui/e-task-table.c:762
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:765
 #, c-format
 msgid "Organizer: %s"
 msgstr "äåè: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3220
 #, c-format
 msgid "Location: %s"
 msgstr "åæ: %s"
@@ -4025,7 +4066,7 @@ msgstr "åããããããããèçãã"
 
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
@@ -4058,7 +4099,7 @@ msgstr "%B%eæ %A"
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1015
+#: ../modules/calendar/e-cal-shell-view-private.c:1053
 msgid "%a %d %b"
 msgstr "%m/%d (%a)"
 
@@ -4070,7 +4111,7 @@ msgstr "%m/%d (%a)"
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1051
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%d %b"
 msgstr "%B%eæ"
 
@@ -4179,21 +4220,21 @@ msgstr "èäãæç"
 msgid "In Process"
 msgstr "éèä"
 
-#: ../calendar/gui/e-meeting-store.c:1834
+#: ../calendar/gui/e-meeting-store.c:1841
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "ããã %s ãããã %s ã free/busy æåããããããããããããããããååã"
 "ããããã"
 
-#: ../calendar/gui/e-meeting-store.c:1844
+#: ../calendar/gui/e-meeting-store.c:1851
 #, c-format
 msgid "Failure reason: %s"
 msgstr "åæãããããåå: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1849
+#: ../calendar/gui/e-meeting-store.c:1856
 #: ../plugins/caldav/caldav-browse-server.c:920
-#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/google-account-setup/google-source.c:448
 #: ../plugins/publish-calendar/publish-calendar.c:332
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -4305,47 +4346,47 @@ msgstr "èè"
 msgid "Member"
 msgstr "ãããã"
 
-#: ../calendar/gui/e-memo-table.c:418
+#: ../calendar/gui/e-memo-table.c:420
 #: ../modules/calendar/e-cal-shell-content.c:472
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view-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:437
 msgid "Memos"
 msgstr "ãã"
 
-#: ../calendar/gui/e-memo-table.c:499 ../calendar/gui/e-task-table.c:721
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:724
 msgid "* No Summary *"
 msgstr "* ãããçã *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:584 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:808
 msgid "Start: "
 msgstr "éå: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:826
 msgid "Due: "
 msgstr "ææ: "
 
-#: ../calendar/gui/e-memo-table.c:717
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Cut selected memos to the clipboard"
 msgstr "éæãããããåãåãããããããããããããããã"
 
-#: ../calendar/gui/e-memo-table.c:723
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Copy selected memos to the clipboard"
 msgstr "éæããããããããããããããããããã"
 
-#: ../calendar/gui/e-memo-table.c:729
+#: ../calendar/gui/e-memo-table.c:738
 msgid "Paste memos from the clipboard"
 msgstr "ããããããããããããèãäããã"
 
-#: ../calendar/gui/e-memo-table.c:735
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Delete selected memos"
 msgstr "éæãããããåéããã"
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:750
 msgid "Select all visible memos"
 msgstr "ããããèçããããããããéæããã"
 
@@ -4357,40 +4398,41 @@ 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:543
+#: ../calendar/gui/e-task-table.c:546
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:640 ../calendar/gui/print.c:2168
+#: ../calendar/gui/e-task-table.c:643 ../calendar/gui/print.c:2168
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:971
+#: ../calendar/importers/icalendar-importer.c:1003
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 #: ../modules/calendar/e-cal-shell-content.c:433
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view-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:435
 msgid "Tasks"
 msgstr "ããã"
 
-#: ../calendar/gui/e-task-table.c:947
+#: ../calendar/gui/e-task-table.c:959
 msgid "Cut selected tasks to the clipboard"
 msgstr "éæããããããåãåãããããããããããããããã"
 
-#: ../calendar/gui/e-task-table.c:953
+#: ../calendar/gui/e-task-table.c:965
 msgid "Copy selected tasks to the clipboard"
 msgstr "éæãããããããããããããããããããã"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:971
 msgid "Paste tasks from the clipboard"
 msgstr "ãããããããããããããèãäããã"
 
-#: ../calendar/gui/e-task-table.c:965
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../calendar/gui/e-task-table.c:977
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "Delete selected tasks"
 msgstr "éæããããããåéããã"
 
-#: ../calendar/gui/e-task-table.c:971
+#: ../calendar/gui/e-task-table.c:983
 msgid "Select all visible tasks"
 msgstr "ããããèçãããããããããéæããã"
 
@@ -4406,8 +4448,10 @@ msgid "%d %B"
 msgstr "%B%eæ"
 
 #: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has alarms."
-msgstr "ããããããã"
+#, fuzzy
+#| msgid "It has recurrences."
+msgid "It has reminders."
+msgstr "çãèãããã"
 
 #: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
@@ -4497,21 +4541,21 @@ msgstr "äæääãããããèç"
 
 #: ../calendar/gui/ea-gnome-calendar.c:50
 #: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1003
+#: ../calendar/importers/icalendar-importer.c:1035
 msgid "Gnome Calendar"
 msgstr "GNOME ãããã"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1011
+#: ../modules/calendar/e-cal-shell-view-private.c:1049
 msgid "%A %d %b %Y"
 msgstr "%Yå%B%eæ %A"
 
 #: ../calendar/gui/ea-gnome-calendar.c:206
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1018
-#: ../modules/calendar/e-cal-shell-view-private.c:1024
-#: ../modules/calendar/e-cal-shell-view-private.c:1027
+#: ../modules/calendar/e-cal-shell-view-private.c:1056
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%a %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -4519,10 +4563,10 @@ msgstr "%Y/%m/%d (%a)"
 #: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1044
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
-#: ../modules/calendar/e-cal-shell-view-private.c:1062
-#: ../modules/calendar/e-cal-shell-view-private.c:1065
+#: ../modules/calendar/e-cal-shell-view-private.c:1082
+#: ../modules/calendar/e-cal-shell-view-private.c:1093
+#: ../modules/calendar/e-cal-shell-view-private.c:1100
+#: ../modules/calendar/e-cal-shell-view-private.c:1103
 msgid "%d %b %Y"
 msgstr "%Yå%B%eæ"
 
@@ -4552,36 +4596,36 @@ msgstr "äãæãããããèç"
 msgid "calendar view for one or more weeks"
 msgstr "äééääãããããèç"
 
-#: ../calendar/gui/gnome-cal.c:2209
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "Purging"
 msgstr "ææä"
 
-#: ../calendar/gui/itip-utils.c:503 ../calendar/gui/itip-utils.c:558
-#: ../calendar/gui/itip-utils.c:661
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:668
 msgid "An organizer must be set."
 msgstr "äåèãããããããããã"
 
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:557
 msgid "At least one attendee is necessary"
 msgstr "æääåãååèãåèãã"
 
-#: ../calendar/gui/itip-utils.c:747 ../calendar/gui/itip-utils.c:908
+#: ../calendar/gui/itip-utils.c:754 ../calendar/gui/itip-utils.c:915
 msgid "Event information"
 msgstr "ãããããæå"
 
-#: ../calendar/gui/itip-utils.c:750 ../calendar/gui/itip-utils.c:911
+#: ../calendar/gui/itip-utils.c:757 ../calendar/gui/itip-utils.c:918
 msgid "Task information"
 msgstr "ããããæå"
 
-#: ../calendar/gui/itip-utils.c:753 ../calendar/gui/itip-utils.c:914
+#: ../calendar/gui/itip-utils.c:760 ../calendar/gui/itip-utils.c:921
 msgid "Memo information"
 msgstr "ãããæå"
 
-#: ../calendar/gui/itip-utils.c:756 ../calendar/gui/itip-utils.c:932
+#: ../calendar/gui/itip-utils.c:763 ../calendar/gui/itip-utils.c:939
 msgid "Free/Busy information"
 msgstr "Free/Busy ãæå"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:766
 msgid "Calendar information"
 msgstr "ãããããæå"
 
@@ -4589,7 +4633,7 @@ msgstr "ãããããæå"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:796
+#: ../calendar/gui/itip-utils.c:803
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "åèæ"
@@ -4598,7 +4642,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:803
+#: ../calendar/gui/itip-utils.c:810
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "(ä)åèæ"
@@ -4610,7 +4654,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:810 ../calendar/gui/itip-utils.c:858
+#: ../calendar/gui/itip-utils.c:817 ../calendar/gui/itip-utils.c:865
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "èéæ"
@@ -4619,7 +4663,7 @@ msgstr "èéæ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:824
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "åäæ"
@@ -4627,7 +4671,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:830
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "æææ"
@@ -4635,7 +4679,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:837
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ããããã"
@@ -4643,7 +4687,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:844
+#: ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ææ"
@@ -4651,29 +4695,29 @@ 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:851
+#: ../calendar/gui/itip-utils.c:858
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ååæ"
 
-#: ../calendar/gui/itip-utils.c:929
+#: ../calendar/gui/itip-utils.c:936
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy ãæå (%s ãã %s)"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:944
 msgid "iCalendar information"
 msgstr "iCalendar æå"
 
-#: ../calendar/gui/itip-utils.c:962
+#: ../calendar/gui/itip-utils.c:969
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "ãããããäçããããããæãããããããäãããããããããã"
 
-#: ../calendar/gui/itip-utils.c:966
+#: ../calendar/gui/itip-utils.c:973
 msgid "Unable to book a resource, error: "
 msgstr "ãããããäçããããããããã: "
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../calendar/gui/itip-utils.c:1134
 msgid "You must be an attendee of the event."
 msgstr "ãããããååããããããããããã"
 
@@ -4832,71 +4876,71 @@ msgstr "å"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3014
+#: ../calendar/gui/print.c:3013
 msgid " to "
 msgstr " ãã "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3024
+#: ../calendar/gui/print.c:3023
 msgid " (Completed "
 msgstr " (åä "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3030
+#: ../calendar/gui/print.c:3029
 msgid "Completed "
 msgstr "åäãããã "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3040
+#: ../calendar/gui/print.c:3039
 msgid " (Due "
 msgstr " (ææ "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3047
+#: ../calendar/gui/print.c:3046
 msgid "Due "
 msgstr "ææ "
 
-#: ../calendar/gui/print.c:3212
+#: ../calendar/gui/print.c:3211
 #, c-format
 msgid "Summary: %s"
 msgstr "ããã: %s"
 
-#: ../calendar/gui/print.c:3239
+#: ../calendar/gui/print.c:3238
 msgid "Attendees: "
 msgstr "ååè: "
 
-#: ../calendar/gui/print.c:3282
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "Status: %s"
 msgstr "çæ: %s"
 
-#: ../calendar/gui/print.c:3297
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Priority: %s"
 msgstr "ååå: %s"
 
-#: ../calendar/gui/print.c:3315
+#: ../calendar/gui/print.c:3314
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "éæç: %i"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3325
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3339
+#: ../calendar/gui/print.c:3338
 #, c-format
 msgid "Categories: %s"
 msgstr "ãããã: %s"
 
-#: ../calendar/gui/print.c:3350
+#: ../calendar/gui/print.c:3349
 msgid "Contacts: "
 msgstr "éçå: "
 
@@ -4925,181 +4969,183 @@ msgstr "ãæããåãã"
 msgid "Appointments and Meetings"
 msgstr "äåãäè"
 
-#: ../calendar/importers/icalendar-importer.c:407
-#: ../calendar/importers/icalendar-importer.c:817
-#: ../plugins/itip-formatter/itip-formatter.c:2094
+#: ../calendar/importers/icalendar-importer.c:421
+#: ../calendar/importers/icalendar-importer.c:834
+#: ../plugins/itip-formatter/itip-formatter.c:2135
 msgid "Opening calendar"
 msgstr "ãããããéã"
 
-#: ../calendar/importers/icalendar-importer.c:547
+#: ../calendar/importers/icalendar-importer.c:561
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ãããã (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:548
+#: ../calendar/importers/icalendar-importer.c:562
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar ããããã"
 
-#: ../calendar/importers/icalendar-importer.c:636
+#: ../calendar/importers/icalendar-importer.c:650
 msgid "Reminder!"
 msgstr "ããããããã!"
 
-#: ../calendar/importers/icalendar-importer.c:716
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar ãããã (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:717
+#: ../calendar/importers/icalendar-importer.c:731
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar ããããã"
 
-#: ../calendar/importers/icalendar-importer.c:966
+#: ../calendar/importers/icalendar-importer.c:998
 msgid "Calendar Events"
 msgstr "ããããããããã"
 
-#: ../calendar/importers/icalendar-importer.c:1004
+#: ../calendar/importers/icalendar-importer.c:1036
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution ããããããããããããããããããã"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "äè"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "ãããã"
 
-#: ../calendar/importers/icalendar-importer.c:1072
-#: ../calendar/importers/icalendar-importer.c:1387
+#: ../calendar/importers/icalendar-importer.c:1104
+#: ../calendar/importers/icalendar-importer.c:1419
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "ããã"
 
-#: ../calendar/importers/icalendar-importer.c:1075
-#: ../calendar/importers/icalendar-importer.c:1388
+#: ../calendar/importers/icalendar-importer.c:1107
+#: ../calendar/importers/icalendar-importer.c:1420
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "ãã"
 
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/importers/icalendar-importer.c:1116
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "çãèããã"
 
-#: ../calendar/importers/icalendar-importer.c:1089
+#: ../calendar/importers/icalendar-importer.c:1121
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "çãèãããããããã"
 
-#: ../calendar/importers/icalendar-importer.c:1094
+#: ../calendar/importers/icalendar-importer.c:1126
+#, fuzzy
+#| msgid "Sh_ow a reminder"
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "ãããããã"
+msgid "has reminders"
+msgstr "ãããããã(_O)"
 
-#: ../calendar/importers/icalendar-importer.c:1099
+#: ../calendar/importers/icalendar-importer.c:1131
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "æäãããããã"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1112
+#: ../calendar/importers/icalendar-importer.c:1144
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "åé"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1147
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "éåé"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1150
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "æç"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1122
+#: ../calendar/importers/icalendar-importer.c:1154
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "åå"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1127
-#: ../calendar/importers/icalendar-importer.c:1427
+#: ../calendar/importers/icalendar-importer.c:1159
+#: ../calendar/importers/icalendar-importer.c:1459
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "ããã"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1133
+#: ../calendar/importers/icalendar-importer.c:1165
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "åæ"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1141
-#: ../calendar/importers/icalendar-importer.c:1423
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1455
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "éå"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1184
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "ææ"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1164
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "End"
 msgstr "çä"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1174
+#: ../calendar/importers/icalendar-importer.c:1206
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "ãããã"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1198
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "åä"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1238
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1217
-#: ../calendar/importers/icalendar-importer.c:1220
+#: ../calendar/importers/icalendar-importer.c:1249
+#: ../calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "äåè"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1240
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1272
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "ååè"
 
-#: ../calendar/importers/icalendar-importer.c:1257
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "èæ"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1419
+#: ../calendar/importers/icalendar-importer.c:1451
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "çé"
@@ -6658,11 +6704,6 @@ msgstr "ååæ/ããã"
 msgid "Save as..."
 msgstr "ååãäå..."
 
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:439
-msgid "Attach a file"
-msgstr "ãããããæäããã"
-
 #: ../composer/e-composer-actions.c:296
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
@@ -6680,7 +6721,7 @@ msgstr "æããããããã(_M)"
 msgid "Open New Message window"
 msgstr "æãããããããäæããããããéããã"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Evolution ãèå"
 
@@ -6824,35 +6865,35 @@ msgstr ""
 "ããããããååããåããããããããããã (Bcc) ãããããããããåãåã"
 "äããããããååããã"
 
-#: ../composer/e-composer-header-table.c:1020
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "ååä(_O):"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "èäå(_R):"
 
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "åå(_T):"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
 msgstr "Cc(_C):"
 
-#: ../composer/e-composer-header-table.c:1043
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
 msgstr "Bcc(_B):"
 
-#: ../composer/e-composer-header-table.c:1048
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
 msgstr "éäå(_P):"
 
-#: ../composer/e-composer-header-table.c:1052
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "äå(_U):"
 
-#: ../composer/e-composer-header-table.c:1061
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "çå(_G):"
 
@@ -6905,13 +6946,13 @@ msgstr ""
 msgid "Compose Message"
 msgstr "ããããããäæ"
 
-#: ../composer/e-msg-composer.c:4155
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "ãããäæããããããããããããäãçéããããããæååãããããããå"
 "ããããããã"
 
-#: ../composer/e-msg-composer.c:4860
+#: ../composer/e-msg-composer.c:4918
 msgid "Untitled Message"
 msgstr "ãããããããããããã"
 
@@ -7018,7 +7059,7 @@ msgstr "ããããããéäããããäåäã"
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "'{0}' ãéåãããããããããããããããããéäãããããã"
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; ãããããããååãããããã"
 
@@ -7100,65 +7141,65 @@ msgid "Please enter your password."
 msgstr "ããããããååããããããã"
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:285
-#: ../modules/online-accounts/e-online-accounts-google.c:357
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
 #: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:483
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "åäãèç:"
 
-#: ../capplet/settings/mail-account-view.c:490
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "åå:"
 
-#: ../capplet/settings/mail-account-view.c:499
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "E-ãããããããã:"
 
-#: ../capplet/settings/mail-account-view.c:509
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
 msgstr "èç:"
 
-#: ../capplet/settings/mail-account-view.c:517
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Receiving"
 msgstr "åä"
 
-#: ../capplet/settings/mail-account-view.c:524
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "ãããçå:"
 
-#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "ãããããããã:"
 
-#: ../capplet/settings/mail-account-view.c:542
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "ãããå:"
 
-#: ../capplet/settings/mail-account-view.c:551
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "æåãäç:"
 
-#: ../capplet/settings/mail-account-view.c:556
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "ããã"
 
-#: ../capplet/settings/mail-account-view.c:568
+#: ../capplet/settings/mail-account-view.c:565
 msgid "Sending"
 msgstr "éä"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:607
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -7168,7 +7209,7 @@ msgstr ""
 "ãããããããããããäèãååãããããããåäãçèããããããèåãè"
 "ããããèåçãèåããããããããããããèççãåæãååããããããã"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:609
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -7178,11 +7219,11 @@ msgstr ""
 "ãããããããååããèåãåäãèãããããåãåæããåèããããããã"
 "ãããã"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:611
 msgid "You can specify more options to configure the account."
 msgstr "ããããããèåãããããããåããããããããæåããããã"
 
-#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:613
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -7190,11 +7231,11 @@ msgstr ""
 "ãããéäãèçãèåãåèãããèåãææãããããããçèããããããã"
 "ããããããã"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr "ããããããããããããããããèåãæåããããããã"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:615
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -7202,104 +7243,104 @@ msgstr ""
 "ããããæçããããããååãèãããããããåããããèåååãçèããã"
 "ãããã"
 
-#: ../capplet/settings/mail-account-view.c:633
-#: ../mail/em-account-editor.c:2181 ../mail/em-account-editor.c:2313
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2237 ../mail/em-account-editor.c:2370
 msgid "Identity"
 msgstr "èåæå"
 
-#: ../capplet/settings/mail-account-view.c:633
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
 msgstr "æ â ããããåä"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "ããããåä"
 
-#: ../capplet/settings/mail-account-view.c:634
-#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
 msgstr "æ â ããããéä"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
 msgstr "æã â èåæå"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
 msgstr "æ â åäãããããã"
 
-#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "åäãããããã"
 
-#: ../capplet/settings/mail-account-view.c:635
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
 msgstr "æã â ããããåä"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "ããããéä"
 
-#: ../capplet/settings/mail-account-view.c:637
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Review account"
 msgstr "æ â ãããããããããã"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Defaults"
 msgstr "æ â ããããã"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
 msgstr "æã â åäãããããã"
 
-#: ../capplet/settings/mail-account-view.c:638
-#: ../mail/em-account-editor.c:3200
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3303
 msgid "Defaults"
 msgstr "ããããã"
 
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
 msgstr "æã â ããããéä"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Review account"
 msgstr "ãããããããããã"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr "åä"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Sending"
 msgstr "æã â éä"
 
-#: ../capplet/settings/mail-account-view.c:760
+#: ../capplet/settings/mail-account-view.c:757
 msgid "Setup Google contacts with Evolution"
 msgstr "Google éçåã Evolution ãèå"
 
 # èæ: ãGoogle Calendarããåæåèããããããèèãåãã
 # ãããããããããããããããããããããã
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:758
 msgid "Setup Google calendar with Evolution"
 msgstr "Google ãããããã Evolution ãèå"
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:763
 msgid "You may need to enable IMAP access."
 msgstr "IMAP ãããããæåãããåèãããããã"
 
-#: ../capplet/settings/mail-account-view.c:774
+#: ../capplet/settings/mail-account-view.c:771
 msgid "Google account settings:"
 msgstr "Google ãããããããèå:"
 
 # èæ: ãYahoo ãããããããåæåèããããããèèãåãã
 # ãããããããããããããããããããããã
-#: ../capplet/settings/mail-account-view.c:800
+#: ../capplet/settings/mail-account-view.c:797
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Yahoo ãããããã Evolution ãèå"
 
-#: ../capplet/settings/mail-account-view.c:804
+#: ../capplet/settings/mail-account-view.c:801
 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 "
@@ -7309,24 +7350,24 @@ msgstr ""
 "ãããããããããçèãäãééãããããããããããååãåååããããã"
 "ãã"
 
-#: ../capplet/settings/mail-account-view.c:813
+#: ../capplet/settings/mail-account-view.c:810
 msgid "Yahoo account settings:"
 msgstr "Yahoo ãããããããèå:"
 
-#: ../capplet/settings/mail-account-view.c:827
+#: ../capplet/settings/mail-account-view.c:824
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo ããããããåå:"
 
-#: ../capplet/settings/mail-account-view.c:1099
+#: ../capplet/settings/mail-account-view.c:1094
 msgid "Password:"
 msgstr "ããããã:"
 
-#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-account-view.c:1145
 #: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "ãããéãã"
 
-#: ../capplet/settings/mail-account-view.c:1160
+#: ../capplet/settings/mail-account-view.c:1155
 msgid "Account Wizard"
 msgstr "ããããããããããã"
 
@@ -7335,19 +7376,18 @@ msgid "Evolution account assistant"
 msgstr "Evolution ãããããããããããã"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:368 ../mail/e-mail-migrate.c:744
-#: ../mail/e-mail-store.c:234 ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:235
-#: ../mail/message-list.c:1714
-#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../capplet/settings/mail-capplet-shell.c:372 ../mail/e-mail-local.c:81
+#: ../mail/e-mail-migrate.c:744 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:152 ../mail/em-folder-tree-model.c:155
+#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:164
+#: ../mail/em-folder-tree-model.c:166
+#: ../modules/addressbook/e-book-shell-backend.c:100
 #: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-backend.c:113
 #: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-backend.c:102
 #: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-backend.c:102
 #: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "ãããããããã"
@@ -7387,7 +7427,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution ããããããããã"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:657
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "ããããããããããããããã"
 
@@ -7517,7 +7557,7 @@ msgstr "èç"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1823
+#: ../modules/calendar/e-cal-shell-view-actions.c:1855
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
@@ -7657,7 +7697,7 @@ msgstr "äæããããããããããã?"
 msgid "File exists \"{0}\"."
 msgstr "ãããããååããããã: \"{0}\""
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "äæããã(_O)"
 
@@ -7669,66 +7709,66 @@ msgstr "ããããéããããããã"
 msgid "Could not display help for Evolution."
 msgstr "Evolution ãããããèçããããããããã"
 
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf ãããã: %s"
 
-#: ../e-util/gconf-bridge.c:1329
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "ããääããããããããçæãããèçããããã"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1054
 #: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "ååä"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1055
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "èäå"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2564 ../mail/em-format-html.c:2632
-#: ../mail/em-format-html.c:2655 ../modules/mail/em-mailer-prefs.c:73
+#: ../mail/em-format-html.c:2574 ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2665 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2565 ../mail/em-format-html.c:2636
-#: ../mail/em-format-html.c:2658 ../modules/mail/em-mailer-prefs.c:74
+#: ../mail/em-format-html.c:2575 ../mail/em-format-html.c:2646
+#: ../mail/em-format-html.c:2668 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Bcc"
 
 #: ../em-format/em-format-quote.c:463 ../em-format/em-format.c:1059
 #: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
 #: ../smime/lib/e-cert.c:1142
 msgid "Subject"
 msgstr "äå"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2757
-#: ../modules/mail/em-mailer-prefs.c:1129
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2767
+#: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "ãããã"
 
-#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1189
+#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1199
 msgid "-------- Forwarded Message --------"
 msgstr "-------- èéããããããã --------"
 
 #: ../em-format/em-format.c:1060 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "æä"
 
-#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "ãããããããã"
 
-#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ãããã"
@@ -7742,36 +7782,36 @@ msgstr "æäãããã: %s"
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME ããããããèæãããããããã: ååäæãããããã"
 
-#: ../em-format/em-format.c:1769 ../em-format/em-format.c:1995
+#: ../em-format/em-format.c:1771 ../em-format/em-format.c:1997
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ããããããèæãããããããããããããèçãããã"
 
-#: ../em-format/em-format.c:1780
+#: ../em-format/em-format.c:1782
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ããããããããã S/MIME ãæååãçé"
 
-#: ../em-format/em-format.c:1800
+#: ../em-format/em-format.c:1802
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME ããããããèæãããããããã"
 
-#: ../em-format/em-format.c:1801
+#: ../em-format/em-format.c:1803
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME ããããããèæãããããããã: ååäæãããããã"
 
-#: ../em-format/em-format.c:2020
+#: ../em-format/em-format.c:2022
 msgid "Unsupported signature format"
 msgstr "ãããããããããçåãæå"
 
-#: ../em-format/em-format.c:2033 ../em-format/em-format.c:2215
+#: ../em-format/em-format.c:2035 ../em-format/em-format.c:2217
 msgid "Error verifying signature"
 msgstr "çåãæèããéãããããççãããã"
 
-#: ../em-format/em-format.c:2034 ../em-format/em-format.c:2200
-#: ../em-format/em-format.c:2216
+#: ../em-format/em-format.c:2036 ../em-format/em-format.c:2202
+#: ../em-format/em-format.c:2218
 msgid "Unknown error verifying signature"
 msgstr "çåãæèããéãååäæãããããççãããã"
 
-#: ../em-format/em-format.c:2308
+#: ../em-format/em-format.c:2310
 msgid "Could not parse PGP message: "
 msgstr "PGP ããããããèæãããããããã: "
 
@@ -7926,7 +7966,9 @@ msgid "No reply or parent"
 msgstr "èäãããèäå"
 
 #: ../filter/e-filter-rule.c:759
-msgid "I_nclude threads"
+#, fuzzy
+#| msgid "I_nclude threads"
+msgid "I_nclude threads:"
 msgstr " ãããããçé(_N):"
 
 #: ../filter/e-filter-rule.c:784
@@ -7972,7 +8014,7 @@ msgstr "æäããããããã"
 msgid "Missing file name."
 msgstr "æåããããããã"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "ååããããããã"
 
@@ -8065,27 +8107,162 @@ msgstr "æåããæé"
 msgid "years"
 msgstr "å"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1217 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "æäãããã"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:845 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "ãã"
 
-#: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
-msgid "Icon View"
-msgstr "ãããããããã"
+#: ../mail/em-account-editor.c:926
+msgid "Never"
+msgstr "ããã"
 
-#: ../mail/e-mail-attachment-bar.c:610
+#: ../mail/em-account-editor.c:927
+msgid "Always"
+msgstr "åã"
+
+#: ../mail/em-account-editor.c:928
+msgid "Ask for each message"
+msgstr "éäããåãçèãã"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1786 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "ãã"
+
+#: ../mail/em-account-editor.c:2185
+#, fuzzy
+#| msgid "_File:"
+msgid "Fil_e:"
+msgstr "ãããã(_F):"
+
+#: ../mail/em-account-editor.c:2185 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "ãã(_P):"
+
+#: ../mail/em-account-editor.c:2234
+msgid "Mail Configuration"
+msgstr "ããããèå"
+
+#: ../mail/em-account-editor.c:2235
+#, fuzzy
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin."
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"Evolution ãããèåãããããããããããã\n"
+"\n"
+"[éã] ããããããããããããããã"
+
+#: ../mail/em-account-editor.c:2238
+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 ""
+"ãããããååã E-ãããããããããååããããããã\"èåæå\" ãæãå"
+"éãããããããããèåçãããããããäãæåãããååãååããããã"
+"ãã"
+
+#: ../mail/em-account-editor.c:2240 ../mail/em-account-editor.c:2429
+msgid "Receiving Email"
+msgstr "ããããåä"
+
+#: ../mail/em-account-editor.c:2241
+msgid "Please configure the following account settings."
+msgstr "ääãããããããèåããããããã"
+
+#: ../mail/em-account-editor.c:2243 ../mail/em-account-editor.c:3026
+msgid "Sending Email"
+msgstr "ããããéä"
+
+#: ../mail/em-account-editor.c:2244
+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 ""
+"ããããéäããææããããæåãååãããããããäæãååããããããç"
+"çèããããããããããããããããããããã (ISP) ããåãããããã"
+
+#: ../mail/em-account-editor.c:2246 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "ãããããæå"
+
+#: ../mail/em-account-editor.c:2247
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"äãããããããããèæãããããååãååããããããã\n"
+"ãããååããååãèçãããäçããããã"
+
+#: ../mail/em-account-editor.c:2251
+msgid "Done"
+msgstr "åä"
+
+#: ../mail/em-account-editor.c:2252
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ãããããããããããããããèåãåäããããã\n"
+"\n"
+"Evolution ãäããããããéåäããæåãæããããã\n"
+"\n"
+"[éç] ãããããããèåãäåããããããã"
+
+#: ../mail/em-account-editor.c:2788
+msgid "Check for _new messages every"
+msgstr "æçããããããããããåæ(_N): "
+
+#: ../mail/em-account-editor.c:2796
+msgid "minu_tes"
+msgstr "ååä(_T)"
+
+#: ../mail/em-account-editor.c:3442 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "ãããããã"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3496 ../mail/em-account-editor.c:3579
+msgid "Receiving Options"
+msgstr "åäãããããã"
+
+#: ../mail/em-account-editor.c:3497 ../mail/em-account-editor.c:3580
+msgid "Checking for New Messages"
+msgstr "æçããããçè"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1395 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "æäãããã"
+
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
+msgid "Icon View"
+msgstr "ãããããããã"
+
+#: ../mail/e-mail-attachment-bar.c:610
 #: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
 msgstr "äèããã"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-#: ../shell/e-shell-window-actions.c:1460
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "ããããããããéããã"
 
@@ -8139,36 +8316,42 @@ msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%déãããããããåää"
 
-#: ../mail/e-mail-folder-utils.c:824
+#: ../mail/e-mail-folder-utils.c:833
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "ãããã '%s' ãåéä"
 
-#: ../mail/e-mail-folder-utils.c:948
+#: ../mail/e-mail-folder-utils.c:967
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "ãããã \"%s\" ãåéããããããã"
 
-#: ../mail/e-mail-folder-utils.c:952
+#: ../mail/e-mail-folder-utils.c:971
 #, fuzzy
 msgid "File has been removed."
 msgstr "ãããã \"%s\" ãåéããããããã"
 
-#: ../mail/e-mail-folder-utils.c:1011
+#: ../mail/e-mail-folder-utils.c:1030
 msgid "Removing attachments"
 msgstr "æäãããããåéä"
 
-#: ../mail/e-mail-folder-utils.c:1175
+#: ../mail/e-mail-folder-utils.c:1194
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%déãããããããäåä"
 
-#: ../mail/e-mail-folder-utils.c:1519 ../mail/em-folder-utils.c:577
+#: ../mail/e-mail-folder-utils.c:1538 ../mail/em-folder-utils.c:612
 #, fuzzy, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "çåããããã: %s"
 
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr ""
+
 #: ../mail/e-mail-label-dialog.c:223
 msgid "_Label name:"
 msgstr "ããããåå(_L):"
@@ -8198,7 +8381,7 @@ msgid "_Later"
 msgstr "äç(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:676
+#: ../modules/mail/e-mail-shell-view-actions.c:679
 msgid "Add Label"
 msgstr "ããããèå"
 
@@ -8227,29 +8410,29 @@ msgid "Name"
 msgstr "åå"
 
 #: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
-#: ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1065
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../mail/em-folder-tree-model.c:717
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "åäç"
 
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:710
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "èæ"
 
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
-#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:721
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "éäããã"
 
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1069
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:725
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "éäæã"
 
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
 #: ../plugins/templates/templates.c:1293
@@ -8285,7 +8468,7 @@ msgstr ""
 "\n"
 "Evolution ããäãããããããåæããããéãåããåããããã..."
 
-#: ../mail/e-mail-migrate.c:1279
+#: ../mail/e-mail-migrate.c:1523
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "'%s' ãããããããããããããããäæããããã: %s"
@@ -8294,691 +8477,691 @@ msgstr "'%s' ãããããããããããããããäæããããã:
 msgid "Please select a folder"
 msgstr "ãããããéæããããããã"
 
-#: ../mail/e-mail-reader-utils.c:139
-#, fuzzy
-msgid "Do not warn me again"
-msgstr "æåããããããããããèçããã"
-
-#. Translators: %s is replaced with a folder
-#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:663
-#, fuzzy, c-format
-msgid ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-"ãããã '%s' ãã %d éãéèããããããããããããããããæåãåéãã"
-"ãã?"
-
-#: ../mail/e-mail-reader-utils.c:960
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "ããããããäå"
-
-#. Translators: This is part of a suggested file name
-#. * used when saving a message or multiple messages to
-#. * mbox format, when the first message doesn't have a
-#. * subject.  The extension ".mbox" is appended to the
-#. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:981
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "ããããã"
-
-#: ../mail/e-mail-reader.c:304 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ãããããããããã"
 
-#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:486
 msgid "C_opy"
 msgstr "ããã(_O)"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ãããããçåãã"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:486
 msgid "_Move"
 msgstr "çå(_M)"
 
-#: ../mail/e-mail-reader.c:1167 ../mail/e-mail-reader.c:1355
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "æåããããããããããèçããã(_D)"
 
-#: ../mail/e-mail-reader.c:1401
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "ãããããããããåã Reply-To: ãçèãã(_A)"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "ååäãããããåãèå(_D)"
 
-#: ../mail/e-mail-reader.c:1769
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "ååäãããããåãèåããã"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "ããããããããããã(_J)"
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "éæããããããããããããããããããããçèããã"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "ãããããããã(_C)..."
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "éæããããããããåãããããããããããã"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "åéããããää(_D)"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "éæããããããããåéããããäããã"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "ããããããããããããã(_L)..."
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ããããããããããããããããããããããããããããäæããã"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "ååããããã(_R)..."
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ããããååããããããããããããããããããäæããã"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "ååäããããã(_N)..."
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
 msgstr "ããååäãããããããããããããããããããäæããã"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "äåããããã(_S)..."
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
 msgstr "ããäåãããããããããããããããããäæããã"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "ãããããéç(_P)"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "éæããããããããåãããããããããããéçããã"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "ãããããããæç(_F)..."
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
 msgstr "èçãããããããææãåãããæååãæçããã"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "ããããèé(_C)"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "éæãããããããããããããããããããããåéããã"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "åäããã(_F)"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1854
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "éæãããããããããããããããããããããåäããããããã"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "ããããããã(_U)..."
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "éæããããããããããããããããããããäããã"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "æäãã(_A)"
 
-#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "éæããããããããæäããèããèéããã"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "æäãããèé(_A)"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "ããããã(_I)"
 
-#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "éæããããããããæããããããããææãæåããèéããã"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
 msgstr "ããããããèé(_I)"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "åçãã(_Q)"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "éæããããããããèäããããåçããèéããã"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "åçãããèé(_Q)"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "çåãèãèã(_L)"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML ããããçåãååçãèãèããã"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "éè(_I)"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "éæããããããããéèããããäããã"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "ãããã(_J)"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "éæãããããããããããããããããäããã"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "ãããããããã(_N)"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "éæãããããããããããããããããåããã"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "æè(_R)"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "éæããããããããæèããããäããã"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "éèãããã(_M)"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "éæããããããããéèããããåããã"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "æè(_U)"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "éæããããããããæèããããäããã"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "æèãããããããããçé(_E)..."
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "éæããããããããéããçéããã"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "æããããããããäæ(_N)"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "ããããããäæãããããããããããéããã"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "æããããããããéã(_O)"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "éæããããããããæããããããããäãéããã"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "ãããããçå(_M)..."
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "éæããããããããåããããããçåããã"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "ãããããåæ(_S)"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
 msgstr "èãããããèçããã"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
 msgstr "æããããåæ(_N)"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr "æããããåãæããã"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
 msgstr "åããããåæ(_P)"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr "åããããåãæããã"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
 msgstr "çåããããéãã(_O)"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
 msgstr "çåããããéããã"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "æããããããã(_N)"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "æãããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "æãéèããããããã(_I)"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "æãéèãããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "æãããããã(_T)"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "æããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "æãæèãããããã(_U)"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "æãæèããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "åããããããã(_P)"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "åãããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "åãéèããããããã(_E)"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "åãéèãããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "åãããããã(_H)"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
 msgstr "åããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "åãæèãããããã(_R)"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "åãæèããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "ããããããååããã"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "ååãããããããããããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "ãããããã(_D)"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "éæããããããããèããèéããã"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
 msgstr "æäãããããåé(_V)"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
 msgstr "æäãããããåéããã"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
 msgstr "éèããããããããåé(_P)"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
 msgstr "éæããããããããåéããããäããã"
 
-#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1509
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "ååãèä(_A)"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "éæããããããããããããååãèäããã"
 
-#: ../mail/e-mail-reader.c:2103 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "ãããããããããèä(_L)"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "éæãããããããããããããããããèäããã"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2118
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "ååäãèä(_R)"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "éæããããããããååäãèäããã"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
 msgstr "mbox ååãäå(_S)..."
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
 msgstr "éæããããããã mbox ååããããããäåããã"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "ããããããããã(_M)"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "ããããããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "åéããããèé(_U)"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "éæããããããããåéãåãæããã"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "éåãããã(_N)"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "æåãããããåæããããæããã"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "æå(_Z)"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "æåãããããåããããã"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "çå(_O)"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "æåãããããåããããã"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "ããããäæ(_U)"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "ãããããããã(_A)"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "åãååãèé(_O)"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
 msgstr "ãããããèä(_G)"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "ãããã(_G)"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "ããããää(_K)"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "ããããã(_M)"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "ããã(_Z)"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2235
 msgid "Search Folder from Mailing _List..."
 msgstr "ãããããããããäæãããã(_L)..."
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2237
 msgid "Create a search folder for this mailing list"
 msgstr "ãããããããããããåããäæãããããäæããã"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2242
 msgid "Search Folder from Recipien_ts..."
 msgstr "ååãããããããæç(_T)..."
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2244
 msgid "Create a search folder for these recipients"
 msgstr "ããããååãåããäæãããããäæããã"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2249
 msgid "Search Folder from Sen_der..."
 msgstr "ååäãäæãããã(_D)..."
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2251
 msgid "Create a search folder for this sender"
 msgstr "ããååäãåããäæãããããäæããã"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2256
 msgid "Search Folder from S_ubject..."
 msgstr "äåãäæãããã(_U)..."
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2258
 msgid "Create a search folder for this subject"
 msgstr "ããäåãåããäæãããããäæããã"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "ãããããããããããããã(_W)..."
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "éèãããããã(_I)"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "ãããããããããã(_J)"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "ãããããããããããããã(_N)"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "æèãããããã(_K)"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "éèããããããããã(_M)"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "æèãããããã(_U)"
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "ãããããããã(_C)"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "èçããããããããææãçæãããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "ãããããããããæå(_H)"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "E-ããããããããåãããããããããããèçããã"
 
-#: ../mail/e-mail-reader.c:2651
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "ããããã '%s' ãååä"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3229 ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:306
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/google-account-setup/google-source.c:688
+#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:310
+#: ../plugins/google-account-setup/google-source.c:553
+#: ../plugins/google-account-setup/google-source.c:692
 #: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "ããããã"
 
-#: ../mail/e-mail-reader.c:3396
+#: ../mail/e-mail-reader.c:3415
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "èé(_F)"
 
-#: ../mail/e-mail-reader.c:3397
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "éæããããããããèããèéããã"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3435
 msgid "Group Reply"
 msgstr "ãããããèä"
 
-#: ../mail/e-mail-reader.c:3417
+#: ../mail/e-mail-reader.c:3436
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ãããããããããããããããããååãèäããã"
 
-#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "åéãã"
 
-#: ../mail/e-mail-reader.c:3503
-#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "æã"
 
-#: ../mail/e-mail-reader.c:3507
-#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "åã"
 
-#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "èä"
 
-#: ../mail/e-mail-reader.c:4186
+#: ../mail/e-mail-reader.c:4205
 #, c-format
 msgid "Folder '%s'"
 msgstr "ãããã '%s'"
 
-#: ../mail/e-mail-session.c:657
+#: ../mail/e-mail-reader-utils.c:145
+#, fuzzy
+msgid "Do not warn me again"
+msgstr "æåããããããããããèçããã"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:669
+#, fuzzy, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"ãããã '%s' ãã %d éãéèããããããããããããããããæåãåéãã"
+"ãã?"
+
+#: ../mail/e-mail-reader-utils.c:1046
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "ããããããäå"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * mbox format, when the first message doesn't have a
+#. * subject.  The extension ".mbox" is appended to the
+#. * string; for example "Message.mbox".
+#: ../mail/e-mail-reader-utils.c:1067
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "ããããã"
+
+#: ../mail/e-mail-session.c:863
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s ããããããããååãããããã"
 
-#: ../mail/e-mail-session.c:661
+#: ../mail/e-mail-session.c:867
 msgid "Enter Passphrase"
 msgstr "ãããããããåå"
 
-#: ../mail/e-mail-session.c:665
+#: ../mail/e-mail-session.c:871
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ãããããããååãããããã"
 
-#: ../mail/e-mail-session.c:669
+#: ../mail/e-mail-session.c:875
 msgid "Enter Password"
 msgstr "ããããããåå"
 
-#: ../mail/e-mail-session.c:720
+#: ../mail/e-mail-session.c:926
 #, c-format
 msgid "User canceled operation."
 msgstr "ãããããããæäããããããããããã"
 
-#: ../mail/e-mail-session.c:833
+#: ../mail/e-mail-session.c:1039
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "ååãæåãããããããããããããããèéãããããããããã"
 
-#: ../mail/e-mail-session.c:842
+#: ../mail/e-mail-session.c:1048
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "åçããããããããããããããããããããèéãããããããããã"
@@ -8988,13 +9171,13 @@ msgstr "åçããããããããããããããããããããèé
 msgid "Cannot get transport for account '%s'"
 msgstr "ããããã '%s' ãåéãäåããããæä"
 
-#: ../mail/e-mail-session-utils.c:506 ../mail/mail-ops.c:633
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ååãããããéçãåæãããã: %s"
 
-#: ../mail/e-mail-session-utils.c:530 ../mail/e-mail-session-utils.c:564
-#: ../mail/mail-ops.c:652 ../mail/mail-ops.c:686
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9003,32 +9186,32 @@ msgstr ""
 "%s ããèåãåæãããã: %s\n"
 "ããããããããã 'éäç' ãèåãããã"
 
-#: ../mail/e-mail-session-utils.c:584 ../mail/mail-ops.c:706
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ããããã 'éäç' ããããããèåãåæãããã: %s"
 
-#: ../mail/e-mail-session-utils.c:795 ../mail/mail-ops.c:809
-#: ../mail/mail-ops.c:905
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "ããããããéää"
 
-#: ../mail/e-mail-session-utils.c:871
+#: ../mail/e-mail-session-utils.c:873
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "ãããã \"%s\" ãèèåæä"
 
-#: ../mail/e-mail-store-utils.c:167
+#: ../mail/e-mail-store-utils.c:168
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "'%s' ããåæä"
 
-#: ../mail/e-mail-store-utils.c:258
+#: ../mail/e-mail-store-utils.c:259
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "'%s' ãåæçä"
 
-#: ../mail/e-mail-store-utils.c:333
+#: ../mail/e-mail-store-utils.c:334
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "ããããããæåä (ããããã: '%s')"
@@ -9037,158 +9220,11 @@ msgstr "ããããããæåä (ããããã: '%s')"
 msgid "Flag to Follow Up"
 msgstr "ãããããããããããã"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:568 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "æååããã"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:572 ../mail/mail-config.ui.h:130
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "TLS ãæååãã"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:576 ../mail/mail-config.ui.h:94
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL ãæååãã"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:839 ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "ãã"
-
-#: ../mail/em-account-editor.c:920
-msgid "Never"
-msgstr "ããã"
-
-#: ../mail/em-account-editor.c:921
-msgid "Always"
-msgstr "åã"
-
-#: ../mail/em-account-editor.c:922
-msgid "Ask for each message"
-msgstr "éäããåãçèãã"
-
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1742 ../widgets/misc/e-account-tree-view.c:131
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "ãã"
-
-#: ../mail/em-account-editor.c:2178
-msgid "Mail Configuration"
-msgstr "ããããèå"
-
-#: ../mail/em-account-editor.c:2179
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"Evolution ãããèåãããããããããããã\n"
-"\n"
-"[éã] ããããããããããããããã"
-
-#: ../mail/em-account-editor.c:2182
-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 ""
-"ãããããååã E-ãããããããããååããããããã\"èåæå\" ãæãå"
-"éãããããããããèåçãããããããäãæåãããååãååããããã"
-"ãã"
-
-#: ../mail/em-account-editor.c:2184 ../mail/em-account-editor.c:2372
-msgid "Receiving Email"
-msgstr "ããããåä"
-
-#: ../mail/em-account-editor.c:2185
-msgid "Please configure the following account settings."
-msgstr "ääãããããããèåããããããã"
-
-#: ../mail/em-account-editor.c:2187 ../mail/em-account-editor.c:2896
-msgid "Sending Email"
-msgstr "ããããéä"
-
-#: ../mail/em-account-editor.c:2188
-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 ""
-"ããããéäããææããããæåãååãããããããäæãååããããããç"
-"çèããããããããããããããããããããã (ISP) ããåãããããã"
-
-#: ../mail/em-account-editor.c:2190 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "ãããããæå"
-
-#: ../mail/em-account-editor.c:2191
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"äãããããããããèæãããããååãååããããããã\n"
-"ãããååããååãèçãããäçããããã"
-
-#: ../mail/em-account-editor.c:2195
-msgid "Done"
-msgstr "åä"
-
-#: ../mail/em-account-editor.c:2196
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"ãããããããããããããããèåãåäããããã\n"
-"\n"
-"Evolution ãäããããããéåäããæåãæããããã\n"
-"\n"
-"[éç] ãããããããèåãäåããããããã"
-
-#: ../mail/em-account-editor.c:2694
-msgid "Check for _new messages every"
-msgstr "æçããããããããããåæ(_N): "
-
-#: ../mail/em-account-editor.c:2702
-msgid "minu_tes"
-msgstr "ååä(_T)"
-
-#: ../mail/em-account-editor.c:3013
-msgid "Please select a folder from the current account."
-msgstr "çåãããããããããããããéæããããããã"
-
-#: ../mail/em-account-editor.c:3339 ../mail/mail-config.ui.h:101
-msgid "Security"
-msgstr "ãããããã"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3393 ../mail/em-account-editor.c:3476
-msgid "Receiving Options"
-msgstr "åäãããããã"
-
-#: ../mail/em-account-editor.c:3394 ../mail/em-account-editor.c:3477
-msgid "Checking for New Messages"
-msgstr "æçããããçè"
-
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1183
+#: ../mail/em-composer-utils.c:1193
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9196,31 +9232,31 @@ msgstr ""
 "${Year}-${Month}-${Day} (${AbbrevWeekdayName}) ã ${24Hour}:${Minute} "
 "${TimeZone} ã ${Sender} ãããæãããã:"
 
-#: ../mail/em-composer-utils.c:1194
+#: ../mail/em-composer-utils.c:1204
 msgid "-----Original Message-----"
 msgstr "-------- ããããããããããã --------"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1975
+#: ../mail/em-composer-utils.c:1985
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "%s åã \"%s\" ããããããããã %s ãèãããããã"
 
-#: ../mail/em-composer-utils.c:2034
+#: ../mail/em-composer-utils.c:2044
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ãããéééç: \"%s\""
 
-#: ../mail/em-composer-utils.c:2536
+#: ../mail/em-composer-utils.c:2567
 msgid "an unknown sender"
 msgstr "ååäãäæ"
 
-#: ../mail/em-composer-utils.c:2937
+#: ../mail/em-composer-utils.c:2972
 msgid "Posting destination"
 msgstr "éäåãæåããã"
 
-#: ../mail/em-composer-utils.c:2938
+#: ../mail/em-composer-utils.c:2973
 msgid "Choose folders to post the message to."
 msgstr "ããããããæçãããããããéæããããããã"
 
@@ -9390,7 +9426,7 @@ msgid "Play Sound"
 msgstr "ãããããæåãã"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "æè"
 
@@ -9503,107 +9539,198 @@ msgstr "ãããããäçé"
 msgid "Folder Properties"
 msgstr "ãããããããããã"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<ããããããããããããããéæãããããã>"
 
-#: ../mail/em-folder-selector.c:385
+#: ../mail/em-folder-selector.c:432
 msgid "C_reate"
 msgstr "äæ(_R)"
 
-#: ../mail/em-folder-selector.c:391
+#: ../mail/em-folder-selector.c:438
 msgid "Folder _name:"
 msgstr "ããããå(_N):"
 
-# "æçãããã"ãéèãããã
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1165 ../mail/mail-vfolder.c:1240
-msgid "Search Folders"
-msgstr "äæãããã"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "èåããããã"
-
-#: ../mail/em-folder-tree-model.c:792 ../mail/em-folder-tree-model.c:1061
-msgid "Loading..."
-msgstr "èãèãä..."
-
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:664
 msgid "Folder names cannot contain '/'"
 msgstr "ããããåãã '/' ãåããããããããããã"
 
-#: ../mail/em-folder-tree.c:1331
+#: ../mail/em-folder-tree.c:784
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1568
+#: ../mail/em-folder-tree.c:1606
 msgid "Mail Folder Tree"
 msgstr "ãããããããããããã"
 
-#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2085 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
 msgstr "ãããã %s ãçåä"
 
-#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
+#: ../mail/em-folder-tree.c:2088 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
 msgstr "ãããã %s ããããä"
 
-#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
+#: ../mail/em-folder-tree.c:2095 ../mail/message-list.c:2212
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ãããã %s ãããããããçåä"
 
-#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
+#: ../mail/em-folder-tree.c:2099 ../mail/message-list.c:2214
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ãããã %s ããããããããããä"
 
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2118
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ãããããããããããããäãçãããã"
 
-#: ../mail/em-folder-utils.c:481
+# "æçãããã"ãéèãããã
+#: ../mail/em-folder-tree-model.c:150 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:159 ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:168 ../mail/em-folder-tree-model.c:170
+#: ../mail/mail-vfolder.c:1121 ../mail/mail-vfolder.c:1235
+msgid "Search Folders"
+msgstr "äæãããã"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:175 ../mail/em-folder-tree-model.c:177
+msgid "UNMATCHED"
+msgstr "èåããããã"
+
+#: ../mail/em-folder-tree-model.c:787 ../mail/em-folder-tree-model.c:1072
+msgid "Loading..."
+msgstr "èãèãä..."
+
+#: ../mail/em-folder-utils.c:487
 msgid "Move Folder To"
 msgstr "ãããããçå"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:487
 msgid "Copy Folder To"
 msgstr "ãããããããã"
 
-#: ../mail/em-folder-utils.c:556
+#: ../mail/em-folder-utils.c:589
 msgid "Create Folder"
 msgstr "ãããããäæ"
 
-#: ../mail/em-folder-utils.c:557
+#: ../mail/em-folder-utils.c:590
 msgid "Specify where to create the folder:"
 msgstr "ãããããäæããåæãæåãããããã:"
 
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1697
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "ããããããæå"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "ããããããæåä..."
+
+#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1561
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "'%s' ãååä"
+
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "çåãã"
 
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "ååãçå"
+
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "çåãçåãã"
+
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr "çåãååããããååäãæèããããã"
+
+#: ../mail/em-format-html.c:1711 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "çåããããããåééãåèãã"
+
+#: ../mail/em-format-html.c:1717 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "æååãã"
+
+#: ../mail/em-format-html.c:1718 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "æååæã (ããããäåå)"
+
+#: ../mail/em-format-html.c:1719 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "æååæã"
+
+#: ../mail/em-format-html.c:1720 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "æååæã (ããããåå)"
+
+#: ../mail/em-format-html.c:2120
+msgid "Unknown external-body part."
+msgstr "external-body ãååãçèããããã"
+
+#: ../mail/em-format-html.c:2130
+msgid "Malformed external-body part."
+msgstr "external-body ãååãåããããã"
+
+#: ../mail/em-format-html.c:2161
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP ããã (%s) ãæããããã"
+
+#: ../mail/em-format-html.c:2172
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "ãããããããã (%s) ãããã \"%s\" ãæãããããããããã"
+
+#: ../mail/em-format-html.c:2174
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "ãããããããã (%s) ããããããããã"
+
+#: ../mail/em-format-html.c:2195
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "ãããããããã (%s) ããããããããã"
+
+#: ../mail/em-format-html.c:2210
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "äæãåéããã (\"%s\" ããã) ããããããããã"
+
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2915
+#: ../plugins/mail-notification/mail-notification.c:402
+#, c-format
+msgid "From: %s"
+msgstr "ååä: %s"
+
+#: ../mail/em-format-html.c:2937
+#, fuzzy
+msgid "(no subject)"
+msgstr "(äåçã)"
+
+#: ../mail/em-format-html.c:3013
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "ãããããããã %s ããã %s ãããäãããéäãããããã"
+
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "ããããããããçåããããããããããããããããäéæãäèãããããã"
 
-#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1698
-msgid "Valid signature"
-msgstr "ååãçå"
-
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9611,21 +9738,13 @@ msgstr ""
 "ãããããããããçåãääãããããããããããããããéåãäéãããã"
 "ãããããããæåãããã"
 
-#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1699
-msgid "Invalid signature"
-msgstr "çåãçåãã"
-
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "èéäãæçããããããããããããããããçåãæèãããããã"
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1700
-msgid "Valid signature, but cannot verify sender"
-msgstr "çåãååããããååäãæèããããã"
-
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9633,11 +9752,7 @@ msgstr ""
 "ãããããããããååãçåãääããããããããããããããååäãæèã"
 "ããããã"
 
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1701
-msgid "Signature exists, but need public key"
-msgstr "çåããããããåééãåèãã"
-
-#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -9645,11 +9760,7 @@ msgstr ""
 "ããããããããçåãääãããããããããããååããåééãääãããã"
 "ãããã"
 
-#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1707
-msgid "Unencrypted"
-msgstr "æååãã"
-
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9657,11 +9768,7 @@ msgstr ""
 "ããããããããæååããããããããããååãããããããããäããéèã"
 "ããåèæãããããã"
 
-#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1708
-msgid "Encrypted, weak"
-msgstr "æååæã (ããããäåå)"
-
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9671,11 +9778,7 @@ msgstr ""
 "ããã(çåçããåéããã)ãããããããããååãéåèãéèããåèæã"
 "ããããã"
 
-#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1709
-msgid "Encrypted"
-msgstr "æååæã"
-
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9683,11 +9786,7 @@ msgstr ""
 "ããããããããæååãããããããããããããããååãéåèãéèããã"
 "ããåéãæããããã"
 
-#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1710
-msgid "Encrypted, strong"
-msgstr "æååæã (ããããåå)"
-
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9696,15 +9795,15 @@ msgstr ""
 "ããããããããååããããããããæååãããããããããããããããåå"
 "ãéåèãéèãããããéåãåéãæããããã"
 
-#: ../mail/em-format-html-display.c:237 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "èææãèç(_V)"
 
-#: ../mail/em-format-html-display.c:250
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
 msgstr "ããèææãèçåèãååããããããã"
 
-#: ../mail/em-format-html-display.c:552
+#: ../mail/em-format-html-display.c:556
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9713,27 +9812,46 @@ msgstr ""
 "ãããæåãããããçæããããåéãããããããããããäããèçããã"
 "ãã"
 
-#: ../mail/em-format-html-display.c:848
+#: ../mail/em-format-html-display.c:746
+#, fuzzy
+#| msgid "Save Message"
+#| msgid_plural "Save Messages"
+msgid "Save Image"
+msgstr "ããããããäå"
+
+#: ../mail/em-format-html-display.c:794
+#, fuzzy
+#| msgid "Save as..."
+msgid "Save _Image..."
+msgstr "ååãäå..."
+
+#: ../mail/em-format-html-display.c:796
+#, fuzzy
+#| msgid "Save the current file"
+msgid "Save the image to a file"
+msgstr "çåããããããäåããã"
+
+#: ../mail/em-format-html-display.c:1024
 msgid "Completed on"
 msgstr "åäæ"
 
-#: ../mail/em-format-html-display.c:860
+#: ../mail/em-format-html-display.c:1036
 msgid "Overdue:"
 msgstr "æéåã:"
 
-#: ../mail/em-format-html-display.c:868
+#: ../mail/em-format-html-display.c:1044
 msgid "by"
 msgstr "ääãææããã:"
 
-#: ../mail/em-format-html-display.c:1142 ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1320 ../mail/em-format-html-display.c:1367
 msgid "View _Unformatted"
 msgstr "ææåãèçãã(_U)"
 
-#: ../mail/em-format-html-display.c:1144
+#: ../mail/em-format-html-display.c:1322
 msgid "Hide _Unformatted"
 msgstr "ææåãèçããã(_U)"
 
-#: ../mail/em-format-html-display.c:1209
+#: ../mail/em-format-html-display.c:1387
 msgid "O_pen With"
 msgstr "æãéã(_P)"
 
@@ -9742,131 +9860,67 @@ msgstr "æãéã(_P)"
 msgid "Page %d of %d"
 msgstr "%d / %d ããã"
 
-#: ../mail/em-format-html.c:165
-msgid "Formatting message"
-msgstr "ããããããæå"
-
-#: ../mail/em-format-html.c:368
-msgid "Formatting Message..."
-msgstr "ããããããæåä..."
-
-#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1551
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "'%s' ãååä"
-
-#: ../mail/em-format-html.c:2110
-msgid "Unknown external-body part."
-msgstr "external-body ãååãçèããããã"
-
-#: ../mail/em-format-html.c:2120
-msgid "Malformed external-body part."
-msgstr "external-body ãååãåããããã"
-
-#: ../mail/em-format-html.c:2151
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP ããã (%s) ãæããããã"
-
-#: ../mail/em-format-html.c:2162
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ãããããããã (%s) ãããã \"%s\" ãæãããããããããã"
-
-#: ../mail/em-format-html.c:2164
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "ãããããããã (%s) ããããããããã"
-
-#: ../mail/em-format-html.c:2185
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "ãããããããã (%s) ããããããããã"
-
-#: ../mail/em-format-html.c:2200
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "äæãåéããã (\"%s\" ããã) ããããããããã"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2905
-#: ../plugins/mail-notification/mail-notification.c:405
-#, c-format
-msgid "From: %s"
-msgstr "ååä: %s"
-
-#: ../mail/em-format-html.c:2927
-#, fuzzy
-msgid "(no subject)"
-msgstr "(äåçã)"
-
-#: ../mail/em-format-html.c:3003
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "ãããããããã %s ããã %s ãããäãããéäãããããã"
-
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
 msgid "No HTML stream available"
 msgstr "HTMLããããããåçããããã"
 
-#: ../mail/em-subscription-editor.c:1138
+#: ../mail/em-subscription-editor.c:1156
 msgid "Folder Subscriptions"
 msgstr "ãããããèè"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1195
 msgid "_Account:"
 msgstr "ããããã(_A):"
 
-#: ../mail/em-subscription-editor.c:1192
+#: ../mail/em-subscription-editor.c:1210
 msgid "Clear Search"
 msgstr "æçãããã"
 
-#: ../mail/em-subscription-editor.c:1210
+#: ../mail/em-subscription-editor.c:1228
 msgid "Sho_w items that contain:"
 msgstr "ääãåããããããèç(_W):"
 
-#: ../mail/em-subscription-editor.c:1249
+#: ../mail/em-subscription-editor.c:1267
 msgid "Subscribe to the selected folder"
 msgstr "éæãããããããèèããã"
 
-#: ../mail/em-subscription-editor.c:1250
+#: ../mail/em-subscription-editor.c:1268
 msgid "Su_bscribe"
 msgstr "èè(_B)"
 
-#: ../mail/em-subscription-editor.c:1261
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../mail/em-subscription-editor.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Unsubscribe from the selected folder"
 msgstr "éæãããããããèèãåæããã"
 
-#: ../mail/em-subscription-editor.c:1262
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../mail/em-subscription-editor.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "_Unsubscribe"
 msgstr "èèãåæ(_U)"
 
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1291
 msgid "Collapse all folders"
 msgstr "ãããããããããçã"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1292
 msgid "C_ollapse All"
 msgstr "ãããçã(_O)"
 
-#: ../mail/em-subscription-editor.c:1284
+#: ../mail/em-subscription-editor.c:1302
 msgid "Expand all folders"
 msgstr "ãããããããããåéãã"
 
-#: ../mail/em-subscription-editor.c:1285
+#: ../mail/em-subscription-editor.c:1303
 msgid "E_xpand All"
 msgstr "ããããåé(_X)"
 
-#: ../mail/em-subscription-editor.c:1295
+#: ../mail/em-subscription-editor.c:1313
 msgid "Refresh the folder list"
 msgstr "ãããããäèãææããã"
 
-#: ../mail/em-subscription-editor.c:1307
+#: ../mail/em-subscription-editor.c:1325
 msgid "Stop the current operation"
 msgstr "çåãæäãåãæããã"
 
@@ -9898,7 +9952,7 @@ msgstr "%s ãããããããããã"
 msgid "Search _Folders"
 msgstr "äæãããã(_F)"
 
-#: ../mail/em-vfolder-rule.c:604
+#: ../mail/em-vfolder-rule.c:608
 msgid "Add Folder"
 msgstr "ãããããèå"
 
@@ -9955,7 +10009,7 @@ msgid "Always request read receipt"
 msgstr "åãéåéçãèæãããããã"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ãããããããããããããèçããããæé (çåä)"
 
@@ -10092,7 +10146,7 @@ msgstr "ãããèçããããããããããããåããã"
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
-"Describes wheter message headers in paned view should be collapsed or "
+"Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr ""
 
@@ -10499,7 +10553,7 @@ msgid "Layout style"
 msgstr "ããããããããã"
 
 #: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "ãããèéãããããããããããããæåå"
 
@@ -11109,33 +11163,14 @@ msgstr ""
 "çãèããã"
 
 #: ../mail/evolution-mail.schemas.in.h:219
-msgid "Use SpamAssassin daemon and client"
-msgstr "SpamAssassin ãããããããããããããäããããã"
-
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr ""
-"SpamAssassin ãããããããããããã (spamc/spamd) ãäçããããããããã"
-
-#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use custom fonts"
 msgstr "ããããããããããäçãããããã"
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts for displaying mail."
 msgstr "ããããèçããéãçèããããããäçããããããããã"
 
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Use only local spam tests."
-msgstr "ãããããããããããããããããããããã"
-
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "Use only the local spam tests (no DNS)."
-msgstr ""
-"(DNS ãäçããã) ãããããåäçãåããããããããããããããããããã"
-"ãããããã"
-
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:221
 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 "
@@ -11145,7 +11180,7 @@ msgstr ""
 "ãããççèãããããããããããããããããäããããããäãããããçå"
 "ããããæåãããã"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -11155,15 +11190,15 @@ msgstr ""
 "ãççèããããããçåãããããããäããããããäãããããéçãããã"
 "ãæåãããã"
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "åååããããã"
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "ããããããããããããããããéåéçãèæãèåããããããããã"
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -11174,7 +11209,7 @@ msgstr ""
 "ãããããããããããããããããããããèåæãéåäãããããããäçã"
 "äçããããã"
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -11182,11 +11217,11 @@ msgstr ""
 "Evolution ãèåããæãæçãããããããããããããããããããããããã"
 "ãéäãããããããããããéäããããããããããã"
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ããããããèçããããããåãççèç (...) ãããããããããã"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11194,11 +11229,11 @@ msgstr ""
 "ãããããã In-Reply-To ããã References ããããçãååããäåãããã"
 "ãããèçãæããããããæåãããã"
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "ãããããäãããããããææãããããããåçãäãæãããããã"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -11208,11 +11243,11 @@ msgstr ""
 "ãäãããããæåãããããããåèããç1åçéããæãããéäããããçã"
 "ããã"
 
-#: ../mail/evolution-mail.schemas.in.h:235
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "ããããããäèããããå"
 
-#: ../mail/evolution-mail.schemas.in.h:236
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "ããããããäèããããåããã"
 
@@ -11220,8 +11255,8 @@ msgstr "ããããããäèããããåããã"
 msgid "Importing Elm data"
 msgstr "Elm ããããããããã"
 
-#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
-#: ../modules/mail/e-mail-shell-view.c:1036
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:453
+#: ../modules/mail/e-mail-shell-view.c:1040
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "ããã"
@@ -11241,13 +11276,13 @@ msgstr "ãããããåãããã(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:142
 #: ../plugins/dbx-import/dbx-importer.c:259
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:446
 msgid "Select folder"
 msgstr "ãããããéæ"
 
 #: ../mail/importers/evolution-mbox-importer.c:143
 #: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:319
+#: ../plugins/pst-import/pst-importer.c:447
 msgid "Select folder to import into"
 msgstr "ãããããåãããããéæ"
 
@@ -11277,8 +11312,7 @@ msgstr "mailbox ãããããã"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:603
-#: ../plugins/pst-import/pst-importer.c:500
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:629
 #, c-format
 msgid "Importing '%s'"
 msgstr "'%s' ããããããä"
@@ -11288,20 +11322,20 @@ msgstr "'%s' ããããããä"
 msgid "Scanning %s"
 msgstr "%s ãèæ"
 
-#: ../mail/importers/pine-importer.c:250
+#: ../mail/importers/pine-importer.c:257
 msgid "Importing Pine data"
 msgstr "Pine ããããããããã"
 
-#: ../mail/importers/pine-importer.c:451
+#: ../mail/importers/pine-importer.c:458
 #: ../modules/addressbook/addressbook-config.c:1053
 msgid "Address Book"
 msgstr "ããããå"
 
-#: ../mail/importers/pine-importer.c:493
+#: ../mail/importers/pine-importer.c:500
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine ããããã"
 
-#: ../mail/importers/pine-importer.c:494
+#: ../mail/importers/pine-importer.c:501
 msgid "Import mail from Pine."
 msgstr "Pine ãããããããããããã"
 
@@ -11462,8 +11496,8 @@ msgid "Confirmations"
 msgstr "çè"
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/addressbook/autocompletion-config.c:178
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "æä/æåãåå"
 
@@ -11609,6 +11643,10 @@ msgstr "ããããããéåéç"
 msgid "No _Proxy for:"
 msgstr "çèããããã(_P):"
 
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "æååããã"
+
 #: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
@@ -11633,7 +11671,7 @@ msgid "Pass_word:"
 msgstr "ããããã(_W):"
 
 #: ../mail/mail-config.ui.h:79
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Pick a color"
 msgstr "èãéæ"
 
@@ -11689,6 +11727,10 @@ msgstr "SHA384"
 msgid "SHA512"
 msgstr "SHA512"
 
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "SSL ãæååãã"
+
 #: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "ãã Evolution ã SSL ããããäãããããããããããã"
@@ -11811,6 +11853,10 @@ msgstr "èäæãæäéãååãéåãã(_T)"
 msgid "Start up"
 msgstr "èå"
 
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "TLS ãæååãã"
+
 #: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "çå(_Y):"
@@ -11872,127 +11918,115 @@ msgid "_Authentication Type"
 msgstr "èèãçé(_A)"
 
 #: ../mail/mail-config.ui.h:145
-msgid "_Default junk plugin:"
-msgstr "ããããããããããã(_D):"
-
-#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "ããããããããçææçãã(_D)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "äèéåèæããçåããã (Outlook äæç)(_D)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "èéæå(_F):"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
 msgstr "ããããããããã(_J)"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr "èäæãçåãããããããããããããäãäã(_K)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "èè(_L)"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
 msgstr "éçåãçéãããããååäãããããããããçåãèãèã(_L)"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "ãããããããããããåããæçãã(_L)"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "ããããããããããããããããã(_M)"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "ãããããããããããèåãèã(_M):"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "çåãèãèããã(_N)"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Path:"
-msgstr "ãã(_P):"
-
-#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "ãããçå(_P):"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ååãåæãããããéçåãéäããååãçèãã(_P)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "èäææ(_R):"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "ããããã(_S):"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "ãããã HTTP ãããã(_S):"
 
-#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "ããã(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
 msgstr "ãããããããçåãåãã(_S)"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "ãããããæãéäèãåçãèçãã(_S)"
 
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
 msgstr "ããçãããã(_T):"
 
-#: ../mail/mail-config.ui.h:170
-msgid "_Use Secure Connection:"
-msgstr "ãããããæçãåçãã(_U):"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
+msgstr "ãããããæçãåç(_U):"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "ãããããããããããäçãã(_U)"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "äãããããåããããããäã(_U)"
 
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "è"
 
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "èæ"
 
-#: ../mail/mail-config.ui.h:177
-msgid "gtk-ok"
-msgstr ""
-
 #: ../mail/mail-dialogs.ui.h:1
 msgid "All active remote folders"
 msgstr "åçåèãããããããããããããã"
@@ -12009,63 +12043,64 @@ msgstr "ãããããããããããã"
 msgid "Call"
 msgstr "åãåã"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "åäãã(_M)"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "éåçå"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "èéããã"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "æåå"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "ããããããã"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "F.Y.I"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "èé"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "ãããããåææ"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "èäãåèãã"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "ååãèä"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "ãããã"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "äæãããããããã"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "ããããããæå"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "æåãããããããã"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12073,23 +12108,23 @@ msgstr ""
 "ããããããããããæåããããããããäèãäèåããããããã\n"
 "\"ããã\" ããããããããããããããååãéæããããããã"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "ããããããåèãã(_A)"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "ææ(_D):"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "ãããäã(_F):"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "ãããããåææãåèããååãããããããããã(_T)"
 
-#: ../mail/mail-folder-cache.c:767
+#: ../mail/mail-folder-cache.c:769
 #, c-format
 msgid "Pinging %s"
 msgstr "%s ã ping äã"
@@ -12102,69 +12137,69 @@ msgstr "éæããããããããããããããã"
 msgid "Fetching Mail"
 msgstr "ããããååä"
 
-#: ../mail/mail-ops.c:820
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d éãããããããéää"
 
-#: ../mail/mail-ops.c:868
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d / %d éããããããéäãåæãããã"
 
-#: ../mail/mail-ops.c:872 ../mail/mail-send-recv.c:824
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "ããããããããã"
 
-#: ../mail/mail-ops.c:874 ../mail/mail-send-recv.c:826
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:826
 msgid "Complete."
 msgstr "åäãããã"
 
-#: ../mail/mail-ops.c:984
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "'%s' ãããããããçåä"
 
-#: ../mail/mail-ops.c:985
+#: ../mail/mail-ops.c:986
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "'%s' ããããããããããä"
 
-#: ../mail/mail-ops.c:1102
+#: ../mail/mail-ops.c:1103
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ãããã '%s' ãæçä"
 
-#: ../mail/mail-ops.c:1176
+#: ../mail/mail-ops.c:1177
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ããããã '%s' ãåéãäåããããæä"
 
-#: ../mail/mail-ops.c:1177
+#: ../mail/mail-ops.c:1178
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ããããã '%s' ãæçä"
 
-#: ../mail/mail-ops.c:1239
+#: ../mail/mail-ops.c:1240
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "ãããã '%s' ãææä"
 
-#: ../mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1418
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "ãããã '%s' ãææä"
 
-#: ../mail/mail-ops.c:1490
+#: ../mail/mail-ops.c:1491
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ãããããçããããä"
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1492
 msgid "Local Folders"
 msgstr "ããããããããã"
 
-#: ../mail/mail-ops.c:1589
+#: ../mail/mail-ops.c:1590
 #, c-format
 msgid "Disconnecting %s"
 msgstr "%s ããåæä"
@@ -12218,7 +12253,7 @@ msgstr "èéããããããã"
 msgid "Setting up Search Folder: %s"
 msgstr "äæãããããèå: %s"
 
-#: ../mail/mail-vfolder.c:238
+#: ../mail/mail-vfolder.c:232
 #, fuzzy, c-format
 msgid "Updating Search Folders for '%s' : %s"
 msgstr "äæãããã '%s:%s' ãææä"
@@ -12228,7 +12263,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.
-#: ../mail/mail-vfolder.c:681
+#: ../mail/mail-vfolder.c:675
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12242,11 +12277,11 @@ msgstr[0] ""
 "åéããããããã \"%2$s\" ãããããããééãã\n"
 "äæãããã \"%1$s\" ãææãããããã"
 
-#: ../mail/mail-vfolder.c:1294
+#: ../mail/mail-vfolder.c:1308
 msgid "Edit Search Folder"
 msgstr "ãããããçé"
 
-#: ../mail/mail-vfolder.c:1408
+#: ../mail/mail-vfolder.c:1413
 msgid "New Search Folder"
 msgstr "æããäæãããã"
 
@@ -12543,41 +12578,48 @@ msgstr "ããããåãéããããããã"
 
 #: ../mail/mail.error.xml.h:66
 #, fuzzy
+#| msgid "Querying server for a list of supported authentication mechanisms."
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr "ããããããããèèããããããäèãããããåãåããããããã"
+
+#: ../mail/mail.error.xml.h:67
+#, fuzzy
 msgid "Failed to remove attachments from messages."
 msgstr "æäçåãçæãããäãèçãããã"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 #, fuzzy
 msgid "Failed to retrieve messages."
 msgstr "ããããããååããããã"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 #, fuzzy
 msgid "Failed to save messages to disk."
 msgstr "%d / %d éããããããéäãåæãããã"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
 msgstr "ãããããèèåæãåæããããã"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "ãããããååãããããããäæããããããã"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "ãããããååãããããããéåããããããããããããã"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "ãããã '{0}' ããéèããããããããåããããããããããã"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "çèããããããããããããããåæãããããããããããããã"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12585,17 +12627,17 @@ msgstr ""
 "ãããããããåéãããããããããããååããããããããããååãããã"
 "ååãåéããããã"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "ãããããããåéãããããããããããååããããååãåéããããã"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "çèãããããããããããããããããããååãåéããããã"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12603,34 +12645,34 @@ msgstr ""
 "çèãããããããããæåã\n"
 "ããããããããæåãååãåéããããã"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "çèãããããããããæåãååãåéããããã"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 "çäãããããããããããããã Evolution ãåèåããããéäãããããã"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "çèãã"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "çåãèè"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "ããããåéãåæãããã"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "ãããããããããèåçãææãããããã"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -12642,7 +12684,7 @@ msgstr ""
 "ååãèèããããããããåéããããããåãããã \"åå\" ããã \"Cc:\" "
 "ãååãèåããããããã"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 #, fuzzy
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
@@ -12653,35 +12695,35 @@ msgstr ""
 "ãããããããããããããããåéãåéããããã\n"
 "æåãåéãããããããããã?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "ããããããããããã"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
 msgstr "ããã(_E)"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
 msgstr "éèããããããããèãããããããããã"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "ããããéæãããããããã"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "äåããããããããããããéãããæéããããããã"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "ããããããèåãçèãããããäåèããããããããã"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "ããããããæåããããããããåãããããããéäããããããããã"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -12690,7 +12732,7 @@ msgstr ""
 "[åå] ãããããããèçããããããããããE-ãããããããããæçããã"
 "ãã"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12699,64 +12741,64 @@ msgstr ""
 "æãååã HTML ååãããããåäããããããããçèãããããã:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "ããçåãäæãèåãããããéèãããååãæåããããããã"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "åããåãããããã"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "\"{0}\" ãããåããããããããããçèããéãåéãççããããã"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ããããããããèèããããããäèãããããåãåããããããã"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "éåéçãèæãããã"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "æåã \"{0}\" ãããããããããããããããããããããåéãããã?"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
 msgstr "\"{0}\" ããããããããæåãåéãããã?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
 msgstr "éèããããããããåéãããã?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
 msgstr "ãããããããèä(_P)"
 
 # Search Folder: äæãããã (æçãããããããã)
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "äæãããããèåçãææããããã"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr "ãããããããèäãéäãããã?"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
 msgstr "ããããååãèäãéãããã?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "æãçåããããã"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "ããããããåçãããããããããããããããåæãããã?"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -12764,7 +12806,7 @@ msgstr ""
 "Evolution ãæããæèããããããããããããããããåèããããååãåæ"
 "ãçåãããåéããããããããããã"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12780,7 +12822,7 @@ msgstr ""
 "ååãèèããããããããåéããããããåãããã \"åå:\" ããã \"Cc:"
 "\" ãååãèåããããããã"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12788,7 +12830,7 @@ msgstr ""
 "ääãåäèãæããããããããããããããèèãããããããã:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12796,15 +12838,15 @@ msgstr ""
 "ääãåäèãæããããããããããããããèèãããããããã:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "ãããããããããããååãåèåèããããããããããã"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:126
 msgid "These messages are not copies."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12812,7 +12854,7 @@ msgstr ""
 "ãããããããèåçãèåããããããããããã\n"
 "åèãããããäæããããããããããèåããæççãèåããããããã"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -12820,12 +12862,12 @@ msgstr ""
 "éæããããããããæåãããããããããããããããéäããããããããã"
 "ã"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "ååãæåããããããããããããããããéäãããããããããã"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -12833,11 +12875,11 @@ msgstr ""
 "ãããããããããçéãèèãããããããããããããããããèèããããã"
 "ããããããããããããã"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "ããçåãåæãããããããäåãããããããã"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -12845,15 +12887,15 @@ msgstr ""
 "éæããããããããããããããããäãããããããããããããæèãããã"
 "ääãããã"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr "éæããããããäãããããããããããæèãããããããããã"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise ããããæçãããããã"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -12861,28 +12903,28 @@ msgstr ""
 "ããããããããèæãããããéãããããäããããããããèæãããããä"
 "çãããã?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "ãããããããããããèãèããããã"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:138
 #, fuzzy
 msgid "Unable to retrieve message."
 msgstr "ããããããååããããã"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "ããããããäçãã(_D)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "ããããããèæãããããäçãããã?"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
 msgstr "ãããããããããããéãããã?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -12892,7 +12934,7 @@ msgstr ""
 "ããããããããããããèäããããããããããèåããããããæåãåçã"
 "çãããã?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:143
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -12901,7 +12943,7 @@ msgstr ""
 "ããããããããççãåãããããããããããããèäããããããããããã"
 "ãããéäèããããããããèäããããããããããæåãåçãçãããã?"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -12909,31 +12951,31 @@ msgstr ""
 "åããååãéãããããããããèäããããããããããããããååãããã"
 "èäãããã?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ããããããåéãããããåèãæéããããããã"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "åèãæåãããããåããããããã"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "éäããããããããããããããããããããçäãããã?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "åãååãããããããäãäããããã"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "ããäæãããããååãäããããããã"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "ãããããæåããããããã"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -12943,65 +12985,65 @@ msgstr ""
 "ãããããããããåããéæããããã/ããããããããããããããããããã"
 "ãããããããããããããããããäæãéæããããããã"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "\"{0}\" ããããããã \"{0}\" ããããããèãããããåæããããã"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
 msgstr "åã(_A)"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "èåãã(_A)"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:156
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "çåããã(_D)"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "çæãã(_D)"
 
-#: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_Empty Trash"
 msgstr "ããçãçããã(_E)"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:159
 msgid "_Exit Evolution"
 msgstr "Evolution ãçä(_E)"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "ææãã(_E)"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:161
 msgid "_Migrate Now"
 msgstr "ãããçè(_M)"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
 msgstr "ããã(_N)"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "ããããããéã(_O)"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "éåéçãéä(_S)"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
 msgstr "åæ(_S)"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
 msgstr "ãã(_Y)"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:169
 msgid "{0}"
 msgstr ""
 
@@ -13045,52 +13087,52 @@ msgstr "éã"
 msgid "Highest"
 msgstr "æãéã"
 
-#: ../mail/message-list.c:1838 ../widgets/table/e-cell-date.c:48
+#: ../mail/message-list.c:1832 ../widgets/table/e-cell-date.c:48
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1845 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1839 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "äæã%p%l:%M"
 
-#: ../mail/message-list.c:1854
+#: ../mail/message-list.c:1848
 msgid "Yesterday %l:%M %p"
 msgstr "ææã%p%l:%M"
 
-#: ../mail/message-list.c:1866
+#: ../mail/message-list.c:1860
 msgid "%a %l:%M %p"
 msgstr "%p%l:%M (%a)"
 
-#: ../mail/message-list.c:1874
+#: ../mail/message-list.c:1868
 msgid "%b %d %l:%M %p"
 msgstr "%B%eæ %p%l:%M"
 
-#: ../mail/message-list.c:1876
+#: ../mail/message-list.c:1870
 msgid "%b %d %Y"
 msgstr "%Yå%B%eæ"
 
-#: ../mail/message-list.c:2644
+#: ../mail/message-list.c:2651
 msgid "Select all visible messages"
 msgstr "ããããããããããéæããã"
 
-#: ../mail/message-list.c:2802 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2809 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ããããã"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:3997
+#: ../mail/message-list.c:4004
 #, fuzzy
 msgid "Follow-up"
 msgstr "ããããããã"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4501 ../mail/message-list.c:4920
+#: ../mail/message-list.c:4508 ../mail/message-list.c:4927
 msgid "Generating message list"
 msgstr "ããããããäèãäæä"
 
-#: ../mail/message-list.c:4738
+#: ../mail/message-list.c:4745
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13098,7 +13140,7 @@ msgstr ""
 "æçæäãæèããããããããããããããæçæäãããããããåæãããã"
 "ããã"
 
-#: ../mail/message-list.c:4740
+#: ../mail/message-list.c:4747
 msgid "There are no messages in this folder."
 msgstr "ããããããããããããããããããã"
 
@@ -13136,27 +13178,27 @@ msgid "Subject - Trimmed"
 msgstr "äå - Trimmed"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1564
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "Body contains"
 msgstr "ããããããææ"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1571
+#: ../modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Message contains"
 msgstr "ãããåä"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1578
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Recipients contain"
 msgstr "åå"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1585
+#: ../modules/mail/e-mail-shell-view-actions.c:1588
 msgid "Sender contains"
 msgstr "ååä"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Subject contains"
 msgstr "äå"
 
@@ -13247,11 +13289,11 @@ msgstr "æç"
 msgid "Downloading"
 msgstr "ãããããã"
 
-#: ../modules/addressbook/addressbook-config.c:1272
+#: ../modules/addressbook/addressbook-config.c:1275
 msgid "Address Book Properties"
 msgstr "ããããåãããããã"
 
-#: ../modules/addressbook/addressbook-config.c:1274
+#: ../modules/addressbook/addressbook-config.c:1277
 msgid "New Address Book"
 msgstr "æããããããå"
 
@@ -13356,65 +13398,65 @@ msgid "Whether to show the preview pane."
 msgstr "ããããããããããèçããããããããã"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:165
-#: ../modules/mail/em-mailer-prefs.c:1150
+#: ../modules/addressbook/autocompletion-config.c:184
+#: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "èãéç(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:187
 msgid "Autocompletion"
 msgstr "èåèå"
 
-#: ../modules/addressbook/autocompletion-config.c:171
+#: ../modules/addressbook/autocompletion-config.c:190
 msgid "Always _show address of the autocompleted contact"
 msgstr "èåèåããéçåã E-ãããããããããèçãã(_S)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-backend.c:102
 #: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "LDAP ããã"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "éçå(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-backend.c:304
 #: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "æããéçåãäæããã"
 
-#: ../modules/addressbook/e-book-shell-backend.c:291
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
 msgstr "éçåãäè(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:311
 #: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "æããéçåãäèãäæããã"
 
-#: ../modules/addressbook/e-book-shell-backend.c:301
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "ããããå(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-backend.c:321
 #: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "æããããããåãäæããã"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:320
+#: ../modules/addressbook/e-book-shell-backend.c:338
 #: ../modules/addressbook/e-book-shell-view.c:405
-#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-backend.c:115
 #: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:364
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "éçå"
 
-#: ../modules/addressbook/e-book-shell-backend.c:330
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
 msgstr "èææ"
 
@@ -13471,10 +13513,10 @@ msgid "Show map with all contacts from selected address book"
 msgstr "éæããããããåãéçåãåããããããã"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:854
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
-#: ../modules/calendar/e-task-shell-view-actions.c:751
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/mail/e-mail-shell-view-actions.c:1204
 msgid "_Rename..."
 msgstr "ååãåæ(_R)..."
 
@@ -13547,22 +13589,22 @@ msgid "Send a message to the selected contacts"
 msgstr "éæããéçåãããããéäããã"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:933
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Actions"
 msgstr "ããããã(_A)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:816
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
 msgid "_Preview"
 msgstr "ããããã(_P)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-memo-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-view-actions.c:843
 msgid "_Delete"
 msgstr "åé(_D)"
 
@@ -13594,9 +13636,9 @@ msgid "Show maps in contact preview window"
 msgstr "éçåããããããããããããèç/éèçãåãæããã"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1018
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/calendar/e-memo-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 msgid "_Classic View"
 msgstr "ãããããããèç(_C)"
 
@@ -13605,9 +13647,9 @@ msgid "Show contact preview below the contact list"
 msgstr "éçåãäèãäãéçåãããããããèçããã"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1025
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:905
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
 msgid "_Vertical View"
 msgstr "çåãèç(_V)"
 
@@ -13616,24 +13658,24 @@ msgid "Show contact preview alongside the contact list"
 msgstr "éçåãäèãæãéçåãããããããèçããã"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1035
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Any Category"
 msgstr "äæããããã"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1677
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Unmatched"
 msgstr "èåããããã"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:967
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:1560
 #: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "æåæç"
@@ -13794,14 +13836,50 @@ msgstr "æççå(_S):"
 msgid "_Timeout:"
 msgstr "ãããããã(_T):"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "ãããããæçãåç(_U):"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "åãããã"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, fuzzy, c-format
+#| msgid "Failed to apply outgoing filters: %s"
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "ååãããããéçãåæãããã: %s"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Bogofilter ãããããã"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "ãããããã Unicode ãåæãã(_U)"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+#, fuzzy
+#| msgid "Bogofilter Options"
+msgid "Bogofilter"
+msgstr "Bogofilter ãããããã"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "ããããææã Unicode ãåæãããããã"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"ããããææã Unicode ã UTF-8 ãåæããããããããæåéåããææããã "
+"\"ããã\" ã \"ãã\" ãèåãäååããããããããã"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -13833,38 +13911,46 @@ msgstr "30å"
 msgid "60 minutes"
 msgstr "60å"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alerts"
 msgstr "èå"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Day _ends:"
 msgstr "äæãçä(_E):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "Days"
 msgstr "æ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Default Free/Busy Server"
 msgstr "ãããããã Free/Busy ããã"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Display"
 msgstr "èç"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#, fuzzy
+#| msgid "Display alarms in _notification area only"
+msgid "Display reminders in _notification area only"
 msgstr "ãããããéçéåãããèçãã(_N)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Hours"
 msgstr "æé"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
 msgid "Minutes"
 msgstr "å"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#, fuzzy
+#| msgid "Publishing Location"
+msgid "Publishing Information"
+msgstr "åéããåæ"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "S_un"
@@ -13879,7 +13965,9 @@ msgid "Se_cond zone:"
 msgstr "åããããããã(_C):"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
+#, fuzzy
+#| msgid "Select the calendars for alarm notification"
+msgid "Select the calendars for reminder notification"
 msgstr "ãããããéçãããããããéæãããããã:"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
@@ -13909,304 +13997,306 @@ msgstr "äæãæéãããããè(_A):"
 msgid "T_hu"
 msgstr "æ(_H)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "ãããããã:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "æå"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "æåãæå:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "ããããããããããããäçãã(_Y)"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "éãéå(_K):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
 msgid "Work Week"
 msgstr "åæ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "åæ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "12 æéå (åå/åå)(_1)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "24 æéå(_2)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "ãããããåéããæãçèãã(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "æéããããéæãççããèçãã(_C)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "äæãéå(_D):"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "é(_F)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "åäããããããéãæé(_H)"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "æ(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "æéãéããããããè(_O):"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "å(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "ééãæéããããäãäåãææãèçãã(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "æéãååããåä(_T):"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "ç(_T)"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "æ(_W)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "åãèçãã"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "åãèçãã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "ãããããããããã"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "ãããããåéããæãçèãããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "äæãæéãããããèãã (æåã \"#rrggbb\")ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "æéãéããããããèãã (æåã \"#rrggbb\")ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "èçæãèåæãããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "èçæãèåæãããããããåä"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "èçæãèåæãããããããå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#, fuzzy
+#| msgid "Calendars to run alarms for"
+msgid "Calendars to run reminders for"
 msgstr "ãããããéããåèããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "æéãããäãæçãã \"Marcus Bains Line\" ãèãã (ããããããç)ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "æéããããäãæçãã \"Marcus Bains line\" ãèããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "æéããããéæãäãããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "ææããåãçèãããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "åæãéå/çäæåãèçããææããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "ããããããäåãããããããæåãããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "ããããããåä (ããããã)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "ããããããããããããå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#, fuzzy
+#| msgid "Directory for saving alarm audio files"
+msgid "Directory for saving reminder audio files"
 msgstr "ããããéããããããäåããããããããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "Free/Busy ãããã URL"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Free/Busy ããããããã URL"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "åäããããããéããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "éãããããåä"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "ããããåãéããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "æåæåããããäç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "åæãçäæå (24æéåãæå: 0ã23) ããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "åæãéåæå (24æéåãæå: 0ã23) ããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "\"true\" ããããããããããããããããããããããããããèçãããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "\"true\" ãããããããããããããããããããããããããããèçãããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "æéãåæããããèçããæéãéé (ååä) ããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#, fuzzy
+#| msgid "Last alarm time"
+msgid "Last reminder time"
 msgstr "æåãããããæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "æéããããçåäçããããããããããããããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "Free/Busy ãããåéããããã URL ãäãããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains Line ãèçãããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains Line ãè - æéããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains Line ãè - æéãã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr ""
 "'day_second_zones' ãäãåæãäçãããããããããåæ (æåå) ããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "åæãäçãããããããããåæ (æåå)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "ãããããããããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "ããããããããããããäç (æå)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "ããããããããããããäç (åç)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "åæãçäæå (å: 0ã59) ããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "åæãéåæå (å: 0ã59) ããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "æéããããæåããããäç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "æéããããåçããããäç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr "èçæãèåæãããããããæåããåäãæã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "ããããããããããããæåããåäãæã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "ããããããéãããæåããåäãæã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "æéãéããããããè"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14214,7 +14304,7 @@ msgstr ""
 "æéãããäåããããããããããäèãéãããæåæåããããäçãã (ã"
 "ãããåä)ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14222,25 +14312,25 @@ msgstr ""
 "æéãããäåããããããããããããããäèãéãããæåæåããããäç"
 "ãã (ããããåä)ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "åçæåãéçãããååãããããããããããããäçããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "æåæåãéçãããååãããããããããããããäçããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "åçæåãéçãããååããããããããããããããäçããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "ãããããããããããããæäããååããåçããããäçããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14248,7 +14338,7 @@ msgstr ""
 "æéãããäåããããããããããããããäèãéãããåçæåããããäç"
 "ãã (ããããåä)ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -14256,32 +14346,42 @@ msgstr ""
 "æéãããäåããããããããããããããäèãéãããåçæåããããäç"
 "ãã (ããããåä)ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "ãããããããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "ãããããããããäè"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "ããããããããããäè"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#, fuzzy
+#| msgid "Programs that are allowed to be run by alarms."
+msgid "Programs that are allowed to be run by reminders."
 msgstr "ãããããåèãããããããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "æéããããçåäçãããã2ççããããããã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "çãèããæäããããããäã"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+#| msgid "Reminder Notes"
+msgid "Reminder programs"
+msgstr "èãæã"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
+#, fuzzy
+#| msgid "Save directory for alarm audio"
+msgid "Save directory for reminder audio"
 msgstr "ããããéããããããäåãããããããã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
@@ -14309,7 +14409,9 @@ msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr "çãèããããããããããããåäããããããäãèçããã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
+#, fuzzy
+#| msgid "Show display alarms in notification tray"
+msgid "Show display reminders in notification tray"
 msgstr "ããããéçéåããããããèçãããããã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
@@ -14441,7 +14543,9 @@ msgid "Time divisions"
 msgstr "æååãåä"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
+#, fuzzy
+#| msgid "Time the last alarm ran, in time_t."
+msgid "Time the last reminder ran, in time_t."
 msgstr "æåããããããéãããæé (time_t åä) ããã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
@@ -14491,7 +14595,9 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "äééãåãããèãææããæææ (0) ããåææ (6) ãæåãããã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
+#, fuzzy
+#| msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr "èåãèçããéã \"ããããéçéå\" ãåçããããããããã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
@@ -14590,114 +14696,127 @@ msgstr "åæãéåæå (æ)"
 msgid "Workday start minute"
 msgstr "åæãéåæå (å)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:286
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "ããããã(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:367
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "ãããããéæ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:394
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "ããããäèãéæ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "ããããããããããã(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:411
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "ãããããããããã(_M)"
 
+#: ../modules/calendar/e-calendar-preferences.c:441
+#, fuzzy
+#| msgid "Selected Calendars for Alarms"
+msgid "Selected Calendars for Reminders"
+msgstr "ãããããéããåèããããã"
+
+#: ../modules/calendar/e-calendar-preferences.c:841
+msgid "Ti_me and date:"
+msgstr "æåãæä(_M):"
+
+#: ../modules/calendar/e-calendar-preferences.c:842
+msgid "_Date only:"
+msgstr "æäãã(_D):"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-backend.c:117
 #: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:100
+#: ../modules/calendar/e-memo-shell-backend.c:104
 #: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:100
+#: ../modules/calendar/e-task-shell-backend.c:104
 #: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "ããã"
 
-#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-backend.c:119
 #: ../plugins/calendar-weather/calendar-weather.c:125
 msgid "Weather"
 msgstr "åæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:202
+#: ../modules/calendar/e-cal-shell-backend.c:206
 #: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "èçæãèåæ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "äå(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Create a new appointment"
 msgstr "æããäåãäæããã"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "çæãäå(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "æããçæãäåãäæããã"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "äè(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "æããäèãåéããã"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ãããã(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new calendar"
 msgstr "æãããããããäæããã"
 
-#: ../modules/calendar/e-cal-shell-backend.c:755
-#: ../plugins/itip-formatter/itip-formatter.c:2951
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "ãããããããã"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:180
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 msgid "Loading calendars"
 msgstr "ãããããèãèãä"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:721
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 msgid "_New Calendar..."
 msgstr "æãããããã(_N)..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:738
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 msgid "Calendar Selector"
 msgstr "ãããããéæ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1087
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s ããããããéã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
+#: ../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:310
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -14708,306 +14827,309 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:327
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "æããåããããããææãã: "
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:541
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr "ããããããããä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 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:1143
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "ãããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1145
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
 #: ../modules/calendar/e-cal-shell-view-memopad.c:220
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:511
-#: ../modules/calendar/e-task-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "Save as iCalendar"
 msgstr "iCalendar ååãäå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Copy..."
 msgstr "ããã(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "D_elete Calendar"
 msgstr "ãããããåé(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "Delete the selected calendar"
 msgstr "éæãããããããåé"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Go Back"
 msgstr "åãæã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Go Forward"
 msgstr "æãéã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Select today"
 msgstr "äæãçåããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Select _Date"
 msgstr "æäãéæ(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Select a specific date"
 msgstr "æåããæãçåããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "_New Calendar"
 msgstr "æãããããã(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-task-shell-view-actions.c:814
 msgid "Purg_e"
 msgstr "ææ(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Purge old appointments and meetings"
 msgstr "åãäåãäèãååãåéããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Re_fresh"
 msgstr "ææ(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Refresh the selected calendar"
 msgstr "éæãããããããææ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Rename the selected calendar"
 msgstr "éæãããããããååãåæããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Show _Only This Calendar"
 msgstr "ããããããããèçãã(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "Cop_y to Calendar..."
 msgstr "ãããããããã(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Delegate Meeting..."
 msgstr "äèãåä(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 msgid "_Delete Appointment"
 msgstr "äåãåé(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
 msgid "Delete selected appointments"
 msgstr "éæããäåãåéããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Delete This _Occurrence"
 msgstr "ãããããããåé(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Delete this occurrence"
 msgstr "ãããããããåéããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Delete All Occ_urrences"
 msgstr "ãããããããããåé(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Delete all occurrences"
 msgstr "ãããããããããåéããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "New All Day _Event..."
 msgstr "æããçæããããã(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Create a new all day event"
 msgstr "æããçæãäåãäæããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1460
 #: ../modules/calendar/e-cal-shell-view-memopad.c:254
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar ååãèé(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1467
 msgid "New _Meeting..."
 msgstr "æããäè(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "Create a new meeting"
 msgstr "æããäèãäæããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 msgid "Mo_ve to Calendar..."
 msgstr "ãããããçå(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1481
 msgid "New _Appointment..."
 msgstr "æããäå(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1488
 msgid "Make this Occurrence _Movable"
 msgstr "ãããããããçååèããã(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1495
 msgid "_Open Appointment"
 msgstr "äåãéã(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
 msgid "View the current appointment"
 msgstr "çåãäåãèç"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1502
 msgid "_Reply"
 msgstr "èä(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1516
 msgid "_Schedule Meeting..."
 msgstr "äèããããããã(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "Converts an appointment to a meeting"
 msgstr "çæãäèãåæããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1523
 msgid "Conv_ert to Appointment..."
 msgstr "çæãåæ(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
 msgid "Converts a meeting to an appointment"
 msgstr "äèãçæãåæããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Quit"
 msgstr "çä"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1650
 msgid "Day"
 msgstr "æ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1652
 msgid "Show one day"
 msgstr "1æãèçããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
 msgid "List"
 msgstr "äè"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
 msgid "Show as list"
 msgstr "äèååãèçããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
 msgid "Month"
 msgstr "æ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
 msgid "Show one month"
 msgstr "1ãæãèçããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
 msgid "Week"
 msgstr "é"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1673
 msgid "Show one week"
 msgstr "1ééãèçããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
 msgid "Show one work week"
 msgstr "åæ1ééãèçããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Active Appointments"
 msgstr "åèäãäå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Next 7 Days' Appointments"
 msgstr "æã7æéãäå"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Description contains"
 msgstr "èæãæããããåã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-memo-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:1002
 msgid "Summary contains"
 msgstr "ããããæããããåã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Print this calendar"
 msgstr "ãããããããååããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Preview the calendar to be printed"
 msgstr "ååããããããããããããããèçããã"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1749
+#: ../modules/calendar/e-cal-shell-view-actions.c:1781
 #: ../modules/calendar/e-cal-shell-view-memopad.c:295
-msgid "Save as iCalendar..."
-msgstr "iCalendar ååãäå..."
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
+msgid "_Save as iCalendar..."
+msgstr "iCalendar ååãäå(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
+#: ../modules/calendar/e-cal-shell-view-actions.c:1858
 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:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:509
+#: ../modules/calendar/e-memo-shell-view-actions.c:523
 msgid "memo"
 msgstr "ãã"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:261
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
 msgid "New _Memo"
 msgstr "æãããã(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-memo-shell-backend.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "Create a new memo"
 msgstr "æãããããäæããã"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:268
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-memo-shell-view-actions.c:662
 msgid "_Open Memo"
 msgstr "ãããéã(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:270
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "View the selected memo"
 msgstr "éæãããããèçããã"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:275
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:655
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:807
 msgid "Open _Web Page"
 msgstr "ããããããããéã(_W)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
 msgid "Print the selected memo"
 msgstr "éæãããããååããã"
 
@@ -15016,22 +15138,22 @@ msgstr "éæãããããååããã"
 #. 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:285
-#: ../modules/calendar/e-task-shell-view-actions.c:626
+#: ../modules/calendar/e-task-shell-view-actions.c:640
 msgid "task"
 msgstr "ããã"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:320
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Assign Task"
 msgstr "ããããååã(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:334
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Mark as Complete"
 msgstr "åäãããããã(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Mark selected tasks as complete"
 msgstr "éæããããããåäããããääããã"
 
@@ -15040,157 +15162,147 @@ msgid "_Mark as Incomplete"
 msgstr "æåäãããããã(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mark selected tasks as incomplete"
 msgstr "éæããããããæåããããããääããã"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:348
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "New _Task"
 msgstr "æããããã(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../modules/calendar/e-task-shell-backend.c:286
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Create a new task"
 msgstr "æããããããäæããã"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:355
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "_Open Task"
 msgstr "ããããéã(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:357
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "View the selected task"
 msgstr "éæããããããèçããã"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:374
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "Print the selected task"
 msgstr "éæããããããååããã"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
-msgid "_Save as iCalendar..."
-msgstr "iCalendar ååãäå(_S)..."
-
-#: ../modules/calendar/e-calendar-preferences.c:441
-msgid "Selected Calendars for Alarms"
-msgstr "ãããããéããåèããããã"
-
-#: ../modules/calendar/e-calendar-preferences.c:840
-msgid "Ti_me and date:"
-msgstr "æåãæä(_M):"
-
-#: ../modules/calendar/e-calendar-preferences.c:841
-msgid "_Date only:"
-msgstr "æäãã(_D):"
-
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ãã(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:305
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "ãããåæ(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:307
 msgid "Create a new shared memo"
 msgstr "æããåæãããäæããã"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ãããäè(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Create a new memo list"
 msgstr "æãããããäèãäæããã"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:175
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
 msgstr "ãããèãèãä"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:662
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 msgid "Memo List Selector"
 msgstr "ãããäèãéæ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:973
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s ããããéããã"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "ãããåå"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Delete Memo"
 msgstr "ãããåé(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "_Find in Memo..."
 msgstr "ããããæç(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Search for text in the displayed memo"
 msgstr "èçãããããåãããæååãæçããã"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
 msgid "D_elete Memo List"
-msgstr "ãããäèããåé(_E)"
+msgstr "ãããäèãåé(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Delete the selected memo list"
 msgstr "éæãããããäèãåéããã"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
 msgid "_New Memo List"
 msgstr "æãããããäè(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Refresh the selected memo list"
 msgstr "éæãããããäèãææ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "Rename the selected memo list"
 msgstr "éæãããããäèãååãåæ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 msgid "Show _Only This Memo List"
 msgstr "ãããããäèããèç(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:713
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
 msgid "Memo _Preview"
 msgstr "ãããããããã(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview pane"
 msgstr "ãããããããããããããèçãããããã"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview below the memo list"
 msgstr "ãããäèãäããããããããããèçããã"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
 msgid "Show memo preview alongside the memo list"
 msgstr "ãããäèãæããããããããããèçããã"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the list of memos"
 msgstr "ãããäèãååããã"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Preview the list of memos to be printed"
 msgstr "ååãããããäèãããããããèçããã"
 
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "èæããããåé"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "ãããåé"
+
 #: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
@@ -15198,63 +15310,55 @@ msgid_plural "%d memos"
 msgstr[0] "%dåããã"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:573
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, c-format
 msgid "%d selected"
 msgstr "%då éææ"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
-msgid "Delete Memos"
-msgstr "èæããããåé"
-
-#: ../modules/calendar/e-memo-shell-view.c:229
-msgid "Delete Memo"
-msgstr "ãããåé"
-
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "ããã(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ããããååã(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
 msgstr "æããããããåãåããäæããã"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "ããããäè(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Create a new task list"
 msgstr "æããããããäèãäæããã"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:175
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
 msgstr "ããããèãèãä"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:662
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 msgid "Task List Selector"
 msgstr "ããããäèãéæ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:973
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ãããããéããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "ããããåå"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:584
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15266,119 +15370,127 @@ msgstr ""
 "\n"
 "æåãããããããããåéãããã?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:591
 msgid "Do not ask me again"
 msgstr "æåããããããããããèçããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "_Delete Task"
 msgstr "ãããåé(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "_Find in Task..."
 msgstr "ãããããæç(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Search for text in the displayed task"
 msgstr "èçããããããããããæååãæçããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Copy..."
 msgstr "ããã..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "D_elete Task List"
 msgstr "ããããäèãåé(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Delete the selected task list"
 msgstr "éæããããããäèãåéããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:744
 msgid "_New Task List"
 msgstr "æããããããäè(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Refresh the selected task list"
 msgstr "éæããããããäèãææ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Rename the selected task list"
 msgstr "éæããããããäèãååãåæ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "Show _Only This Task List"
 msgstr "ããããããäèããèç(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Mar_k as Incomplete"
 msgstr "æåäãããããã(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Delete completed tasks"
 msgstr "åäããããããåéããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:877
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Task _Preview"
 msgstr "ããããããããã(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:879
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview pane"
 msgstr "ããããããããããããããèçãã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Show task preview below the task list"
 msgstr "ããããäèãäãããããããããããèçããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Show task preview alongside the task list"
 msgstr "ããããäèãæãããããããããããèçããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Active Tasks"
 msgstr "åèäãããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Completed Tasks"
 msgstr "åäããããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Next 7 Days' Tasks"
 msgstr "æã7æéãããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Overdue Tasks"
 msgstr "æéãéããããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Tasks with Attachments"
 msgstr "æäãããããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Print the list of tasks"
 msgstr "ããããäèãååããã"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
 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:472
 msgid "Expunging"
 msgstr "ææ"
 
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%dåãããã"
 
-#: ../modules/calendar/e-task-shell-view.c:362
-msgid "Delete Tasks"
-msgstr "ããããåé"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "Evolution ãããããããããããã"
 
-#: ../modules/calendar/e-task-shell-view.c:364
-msgid "Delete Task"
-msgstr "ããããåä"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "ãããããããããã"
 
 #. Translators: This is only for multiple messages.
 #: ../modules/mail/e-mail-attachment-handler.c:384
@@ -15386,13 +15498,6 @@ msgstr "ããããåä"
 msgid "%d attached messages"
 msgstr "%d åãæäããããã"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:94
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "ãã"
-
 #: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
@@ -15411,453 +15516,426 @@ msgstr "ãããããããã(_F)"
 msgid "Create a new mail folder"
 msgstr "æãããããããããããäæããã"
 
-#: ../modules/mail/e-mail-shell-backend.c:408
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "ããããããããã"
 
-#: ../modules/mail/e-mail-shell-backend.c:416
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "ããããèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:424
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "ããããããèå"
 
-#: ../modules/mail/e-mail-shell-backend.c:432
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "ãããããããèå"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view.c:949
 msgid "_Disable Account"
 msgstr "ããããããçåå(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "Disable this account"
 msgstr "ããããããããçåããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ãããããããããåéããããäããããããããååãåéããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1134
 msgid "_Download Messages for Offline Usage"
 msgstr "ãããããããããããã(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "ããããããåçãããããæåããããããããããããããããããããããã"
 "ããããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1138
+#: ../modules/mail/e-mail-shell-view-actions.c:1141
 msgid "Fl_ush Outbox"
 msgstr "éäããããããããã(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1148
 msgid "_Copy Folder To..."
 msgstr "ãããããããã(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 msgid "Copy the selected folder into another folder"
 msgstr "éæãããããããåãããããããããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "Permanently remove this folder"
 msgstr "ãããããããååãåéããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 msgid "E_xpunge"
 msgstr "ææ(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ãããããããåéããããäããããããããååãåéããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Mar_k All Messages as Read"
 msgstr "ãããæèããã(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "Mark all messages in the folder as read"
 msgstr "ãããããããããããããããããæèããããääããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1176
 msgid "_Move Folder To..."
 msgstr "ãããããçå(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "Move the selected folder into another folder"
 msgstr "éæãããããããåããããããçåããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "_New..."
 msgstr "æè(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Create a new folder for storing mail"
 msgstr "ããããæçãããããæãããããããçæããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "Change the properties of this folder"
 msgstr "ãããããããèåãåæããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "Refresh the folder"
 msgstr "ãããããäèãææããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Change the name of this folder"
 msgstr "ãããããããååãåæããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
 msgid "Select Message _Thread"
 msgstr "ããããããããããéæ(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select all messages in the same thread as the selected message"
 msgstr "éæããããããããåãããããããããããããããéæããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Select Message S_ubthread"
 msgstr "ãããããããéæ(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "Select all replies to the currently selected message"
 msgstr "éæããããããããåããèäããããéæããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Empty _Trash"
 msgstr "ããçãçããã(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ããããããããããåéããããäããããããããååãåéããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "_New Label"
 msgstr "æããããã(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1248
 msgid "N_one"
 msgstr "ãã(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1262
 msgid "_Manage Subscriptions"
 msgstr "èèãçç(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1341
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ããããããããããããããããèèãéå/åæãåãæããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1290
 msgid "Send / _Receive"
 msgstr "éåä(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Send queued items and retrieve new items"
 msgstr "ããããããããããããéäããæçããããããåäããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1276
 msgid "R_eceive All"
 msgstr "ãããåä(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Receive new items from all accounts"
 msgstr "ããããããããããæãããããããåäããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1283
 msgid "_Send All"
 msgstr "ãããéä(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Send queued items in all accounts"
 msgstr "ããããããããããããããããããããããéäããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1311
 #: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "ããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Cancel the current mail operation"
 msgstr "çåããããæäãåãæããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
 msgid "Collapse All _Threads"
 msgstr "ãããããããããæãçã(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "Collapse all message threads"
 msgstr "ããããããåãããããæãçããèçããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1325
 msgid "E_xpand All Threads"
 msgstr "ãããããããããåéãã(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "Expand all message threads"
 msgstr "ããããããåãããããåéããèçããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1332
 msgid "_Message Filters"
 msgstr "ãããããåç(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "Create or edit rules for filtering new mail"
 msgstr "æçããããããããããããããäæãããçéããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1339
 msgid "_Subscriptions..."
 msgstr "èè(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1348
 msgid "F_older"
 msgstr "ãããã(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1355
 msgid "_Label"
 msgstr "ããã(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1369
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "C_reate Search Folder From Search..."
 msgstr "æççæããäæãããããäæ(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1379
 msgid "Search F_olders"
 msgstr "äæãããããçé(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1381
 msgid "Create or edit search folder definitions"
 msgstr "äæãããããåçãäæãããçéããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
 msgid "_New Folder..."
 msgstr "æãããããã(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1440
 msgid "Show Message _Preview"
 msgstr "ãããããããããããèç(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1442
 msgid "Show message preview pane"
 msgstr "ããããããããããããããããããèçããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "Show _Deleted Messages"
 msgstr "åéããããããããèç(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1447
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "Show deleted messages with a line through them"
 msgstr "åéããããããããæãæãçãäããèçãã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "_Group By Threads"
 msgstr "ãããããããããå(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1455
+#: ../modules/mail/e-mail-shell-view-actions.c:1458
 msgid "Threaded message list"
 msgstr "ããããããäèãããããèç"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1476
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "Show message preview below the message list"
 msgstr "ããããããäèãäãããããããããããããèçããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "Show message preview alongside the message list"
 msgstr "ããããããäèãæãããããããããããããèçããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1494
 msgid "All Messages"
 msgstr "ããããããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1501
 msgid "Important Messages"
 msgstr "éèãããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1508
 msgid "Last 5 Days' Messages"
 msgstr "ãã5æéãããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1515
 msgid "Messages Not Junk"
 msgstr "ããããããããããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1522
 msgid "Messages with Attachments"
 msgstr "æäãããããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "No Label"
 msgstr "ããããããããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "Read Messages"
 msgstr "æèãããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Recent Messages"
 msgstr "æèãããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Unread Messages"
 msgstr "æèãããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/mail/e-mail-shell-view-actions.c:1602
 msgid "Subject or Addresses contain"
 msgstr "äåããããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1609
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "All Accounts"
 msgstr "ããããããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "Current Account"
 msgstr "çåãããããã"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Current Folder"
 msgstr "çåããããã"
 
-#: ../modules/mail/e-mail-shell-view-private.c:996
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "ããããããããããæç"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "ããããããæç"
+
+#: ../modules/mail/e-mail-shell-view.c:947
+msgid "Proxy _Logout"
+msgstr "ããããããããããã(_L)"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " éææ %déã"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "åéæ %dé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "ãããã %dé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "èæ %dé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "æéä %dé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "éäæ %dé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "æè %dé, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "åè %dé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "ããç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1541
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "éä / åä"
 
-#: ../modules/mail/e-mail-shell-view.c:559
-msgid "All Account Search"
-msgstr "ããããããããããæç"
-
-#: ../modules/mail/e-mail-shell-view.c:732
-msgid "Account Search"
-msgstr "ããããããæç"
-
-#: ../modules/mail/e-mail-shell-view.c:943
-msgid "Proxy _Logout"
-msgstr "ããããããããããã(_L)"
-
-#: ../modules/mail/em-account-prefs.c:218
-msgid "Evolution Account Assistant"
-msgstr "Evolution ãããããããããããã"
-
-#: ../modules/mail/em-account-prefs.c:267
-msgid "Account Editor"
-msgstr "ãããããããããã"
-
-#: ../modules/mail/em-composer-prefs.c:491
+#: ../modules/mail/em-composer-prefs.c:493
 #: ../modules/plugin-manager/evolution-plugin-manager.c:359
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "æå"
 
-#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/mail/em-composer-prefs.c:497
 msgid "Language(s)"
 msgstr "èè"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "æå"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "æãäå"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "éãäå"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "æãäå"
 
-#: ../modules/mail/em-mailer-prefs.c:288
+#: ../modules/mail/em-mailer-prefs.c:289
 msgid "Header"
 msgstr "ããã"
 
-#: ../modules/mail/em-mailer-prefs.c:292
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Contains Value"
-msgstr "ãããããååããå"
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:703 ../modules/mail/em-mailer-prefs.c:776
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "\"%s\" ããããããããããããããããåçåèããããããã"
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:711 ../modules/mail/em-mailer-prefs.c:785
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"\"%s\" ãããããããåçããããã (ããããããããããããããããããçè"
-"ãããããã)ã"
-
-#: ../modules/mail/em-mailer-prefs.c:749
-msgid "No junk plugin available"
-msgstr "ããããååãããããããåçããããã"
+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:1152
+#: ../modules/mail/em-mailer-prefs.c:1031
 msgid "_Date header:"
 msgstr "æäãããã(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1032
 msgid "Show _original header value"
 msgstr "åãããããåãèç(_O):"
 
@@ -15941,6 +16019,14 @@ msgstr "ããããã(_P)"
 msgid "Enable and disable plugins"
 msgstr "ããããããæå/çåãççããã"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python ãããããããããã"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python ã EPlugin ãããçããããããããããããã"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "ããããã Python"
@@ -15949,47 +16035,104 @@ msgstr "ããããã Python"
 msgid "Python Plugin Loader tests"
 msgstr "Python ããããããããããããã"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python ãããããããããã"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, fuzzy, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "ãããã '%s' ãéãããã (%s)"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Python ã EPlugin ãããçããããããããããããã"
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+#, fuzzy
+#| msgid "Filter junk messages using SpamAssassin."
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "SpamAssassin ãäããããããããããããããããããã"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, fuzzy, c-format
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "%d / %d éããããããéäãåæãããã"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+#, fuzzy
+msgid "Failed to read output from SpamAssassin: "
+msgstr "æäçåãçæãããäãèçãããã"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin ãããããã"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "ãããããããããããããã(_N)"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+#, fuzzy
+#| msgid "This will make SpamAssassin more reliable, but slower"
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "ãããæãäéæãéããããããããäéããããã"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+#, fuzzy
+#| msgid "SpamAssassin Options"
+msgid "SpamAssassin"
+msgstr "SpamAssassin ãããããã"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "SpamAssassin ãããããããããããããäããããã"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr ""
+"SpamAssassin ãããããããããããã (spamc/spamd) ãäçããããããããã"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "ãããããããããããããããããããããã"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+"(DNS ãäçããã) ãããããåäçãåããããããããããããããããããã"
+"ãããããã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:281
+#: ../modules/startup-wizard/evolution-startup-wizard.c:279
 #: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "ããããããããæåãéæãããããã:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:311
 #: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "ååä %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:324
-#: ../modules/startup-wizard/evolution-startup-wizard.c:422
+#: ../modules/startup-wizard/evolution-startup-wizard.c:322
+#: ../modules/startup-wizard/evolution-startup-wizard.c:420
 msgid "Importing Files"
 msgstr "ãããããããããã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:400
+#: ../modules/startup-wizard/evolution-startup-wizard.c:398
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "ããããããããããããããããããéããããããããããçèãããã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:418
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "ããããããåäããããããéããããããããããçèãããã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:492
+#: ../modules/startup-wizard/evolution-startup-wizard.c:496
 msgid "Evolution Setup Assistant"
 msgstr "Evolution èåãããããã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:502
 msgid "Welcome"
 msgstr "ãããã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+#: ../modules/startup-wizard/evolution-startup-wizard.c:507
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -16002,7 +16145,7 @@ msgstr ""
 "\n"
 "[éã] ãããããããããããçèãããã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:608
+#: ../modules/startup-wizard/evolution-startup-wizard.c:612
 #, fuzzy
 msgid "Loading accounts..."
 msgstr "èãèãä..."
@@ -16343,60 +16486,6 @@ msgstr ""
 "ããããããäéãããããèåçããããããããããããããããéçåæåã"
 "èåãããã"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr "Bogofilter ãåçããããããæåãããããããããããããã"
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:165
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "%s ãåãããããåèããéãããããççãããã: %s"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:194
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "Bogofilter ãåããããããåçãããããååçäãããããã..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "Bogofilter ãåãããããããåãèãåããåããã..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:219
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "Bogofilter ãåããããããåæãããã (ããããããã: %d)"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:404
-msgid "Convert message text to _Unicode"
-msgstr "ãããããã Unicode ãåæãã(_U)"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "ããããææã Unicode ãåæãããããã"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"ããããææã Unicode ã UTF-8 ãåæããããããããæåéåããææããã "
-"\"ããã\" ã \"ãã\" ãèåãäååããããããããã"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "Bogofilter ãããããããã"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "Bogofilter ãããããã"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "Bogofilter ãäããããããããããããããããããã"
-
 #: ../plugins/caldav/caldav-browse-server.c:203
 msgid "Authentication failed. Server requires correct login."
 msgstr "èèãåæãããããããããæãããããããããããèæãããããã"
@@ -16468,7 +16557,7 @@ msgid "Searching folder content..."
 msgstr "ãããããååãæçä..."
 
 #: ../plugins/caldav/caldav-browse-server.c:1262
-#: ../plugins/caldav/caldav-source.c:258
+#: ../plugins/caldav/caldav-source.c:257
 msgid "Server _handles meeting invitations"
 msgstr "ããããäèãæåãåç(_H)"
 
@@ -16481,8 +16570,10 @@ msgid "Supports"
 msgstr "åå"
 
 #: ../plugins/caldav/caldav-browse-server.c:1334
-#: ../plugins/caldav/caldav-source.c:256
-msgid "User e-_mail:"
+#: ../plugins/caldav/caldav-source.c:255
+#, fuzzy
+#| msgid "User e-_mail:"
+msgid "User e_mail:"
 msgstr "ããã(_M):"
 
 #: ../plugins/caldav/caldav-browse-server.c:1406
@@ -16499,33 +16590,36 @@ msgstr "ãããã URL '%s' ãæãã URL ããããããã"
 msgid "Browse for a CalDAV calendar"
 msgstr "CalDAV ãããããåç"
 
-#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/caldav/caldav-source.c:236
 #: ../plugins/calendar-http/calendar-http.c:104
 msgid "_URL:"
 msgstr "URL(_U):"
 
-#: ../plugins/caldav/caldav-source.c:244
+#: ../plugins/caldav/caldav-source.c:243
+#: ../plugins/calendar-http/calendar-http.c:138
 #: ../plugins/google-account-setup/google-contacts-source.c:351
-msgid "Use _SSL"
-msgstr "SSL ãäçãã(_S)"
+#, fuzzy
+#| msgid "_Use secure connection:"
+msgid "Use _secure connection"
+msgstr "ãããããæçãåç(_U):"
 
-#: ../plugins/caldav/caldav-source.c:246
+#: ../plugins/caldav/caldav-source.c:245
 #: ../plugins/google-account-setup/google-contacts-source.c:329
-#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/google-account-setup/google-source.c:656
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
 msgid "User_name:"
 msgstr "ãããå(_N):"
 
-#: ../plugins/caldav/caldav-source.c:261
+#: ../plugins/caldav/caldav-source.c:260
 msgid "Brows_e server for a calendar"
 msgstr "ããããåçãããããããæã(_E)"
 
-#: ../plugins/caldav/caldav-source.c:279
+#: ../plugins/caldav/caldav-source.c:278
 #: ../plugins/calendar-file/calendar-file.c:195
 #: ../plugins/calendar-http/calendar-http.c:123
 #: ../plugins/calendar-weather/calendar-weather.c:403
 #: ../plugins/google-account-setup/google-contacts-source.c:369
-#: ../plugins/google-account-setup/google-source.c:659
+#: ../plugins/google-account-setup/google-source.c:663
 msgid "Re_fresh:"
 msgstr "ææ(_F):"
 
@@ -16573,10 +16667,6 @@ msgstr "ãããããããããã Evolution ãèåãããã"
 msgid "Local Calendars"
 msgstr "ãããããããããæè"
 
-#: ../plugins/calendar-http/calendar-http.c:138
-msgid "_Secure connection"
-msgstr "ãããããæçãåçãã(_S)"
-
 #: ../plugins/calendar-http/calendar-http.c:198
 msgid "Userna_me:"
 msgstr "ãããå(_M):"
@@ -16933,14 +17023,14 @@ msgstr "éæãããããããæãã .png çåãããããããã
 msgid "Server"
 msgstr "ããã"
 
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:447
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "ãããããäèãããããããããã %s ãããããããããããããååãããã"
 "ããã"
 
-#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/google-account-setup/google-source.c:564
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16949,17 +17039,17 @@ msgstr ""
 "Google ãããããããããååããããã:\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:560
-#: ../plugins/mail-to-task/mail-to-task.c:796
-#: ../plugins/mail-to-task/mail-to-task.c:1045
+#: ../plugins/google-account-setup/google-source.c:564
+#: ../plugins/mail-to-task/mail-to-task.c:803
+#: ../plugins/mail-to-task/mail-to-task.c:1066
 msgid "Unknown error."
 msgstr "ååãçåãããããããããã"
 
-#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-source.c:667
 msgid "Cal_endar:"
 msgstr "ãããã(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Retrieve _List"
 msgstr "äèãååãã(_L)"
 
@@ -16983,12 +17073,12 @@ msgstr "ãããããçå"
 msgid "View image attachments directly in mail messages."
 msgstr "æäçåãçæãããäãèçãããã"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:329
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "çèãããã"
 
-#: ../plugins/imap-features/imap-headers.c:346
+#: ../plugins/imap-features/imap-headers.c:341
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP ãããã"
@@ -17015,8 +17105,12 @@ msgstr ""
 "çèãããããæåãããããããããããããããããããããããããã"
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
+#, fuzzy
+#| msgid ""
+#| "_Basic Headers - (Fastest) \n"
+#| "Use this if you do not have filters based on mailing lists"
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "åæçãããããã (éé)(_B)\n"
@@ -17041,141 +17135,141 @@ msgstr "IMAP ãæå"
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "ãããã '%s' ãéãããã (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:631
+#: ../plugins/itip-formatter/itip-formatter.c:645
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "ãããã '%s' ãäåãããäèãæéãéãããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:655
+#: ../plugins/itip-formatter/itip-formatter.c:669
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "ãããã '%s' ãäãäåãããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:761
+#: ../plugins/itip-formatter/itip-formatter.c:775
 msgid "Unable to find any calendars"
 msgstr "ãããããèããããããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:782
 msgid "Unable to find this meeting in any calendar"
 msgstr "ããäèãäåãèéãããããããèããããããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:772
+#: ../plugins/itip-formatter/itip-formatter.c:786
 msgid "Unable to find this task in any task list"
 msgstr "ããããããèéããããããäèãèããããããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this memo in any memo list"
 msgstr "ããããããèéããããããäèãèããããããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1026
+#: ../plugins/itip-formatter/itip-formatter.c:1067
 #, fuzzy
 msgid "Opening the calendar. Please wait..."
 msgstr "ãããããéãããããããåããããã.."
 
 # èåè
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1070
 msgid "Searching for an existing version of this appointment"
 msgstr "ããäåãæåããããããæç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1302
+#: ../plugins/itip-formatter/itip-formatter.c:1343
 msgid "Unable to parse item"
 msgstr "ãããããèæããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1391
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ããããããããã '%s' ãäåããããã (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1444
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "æèããããããããããã '%s' ãäåãããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "äæèããããããããããã '%s' ãäåãããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "èéããããããããããã '%s' ãäåãããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ãããããããããããããããã '%s' ãäåãããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1552
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizer ã %s ããåèãåéãããã "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1559
 msgid "Sent a cancelation notice to the delegate"
 msgstr "DeleGate ããããããéçãéäãããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1561
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "DeleGate ããããããéçãéäãããããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1631
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "äæãããããããããååçæãææãããããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1701
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ååè %s ãææããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "Attendee status updated"
 msgstr "ååçæãææãããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1709
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ãããããããååãããããããååçæãææãããããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1690
+#: ../plugins/itip-formatter/itip-formatter.c:1731
 msgid "Meeting information sent"
 msgstr "äèãæåãéä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1693
+#: ../plugins/itip-formatter/itip-formatter.c:1734
 msgid "Task information sent"
 msgstr "ãããæåãéä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1696
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Memo information sent"
 msgstr "ããæåãéä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1746
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "äèãååããããããããäèãæåãéäããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1708
+#: ../plugins/itip-formatter/itip-formatter.c:1749
 msgid "Unable to send task information, the task does not exist"
 msgstr "ããããååããããããããããããæåãéäããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1711
+#: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ãããååãããããããããããæåãéäããããã"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1817
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1781
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Save Calendar"
 msgstr "ãããããäå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1839
-#: ../plugins/itip-formatter/itip-formatter.c:1850
+#: ../plugins/itip-formatter/itip-formatter.c:1880
+#: ../plugins/itip-formatter/itip-formatter.c:1891
 msgid "The calendar attached is not valid"
 msgstr "æäããããããããäæãã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1840
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:1881
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17183,15 +17277,15 @@ msgstr ""
 "ãããããããããããæäãããããããããããããããååã iCalendar åå"
 "ãããããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1891
-#: ../plugins/itip-formatter/itip-formatter.c:1919
-#: ../plugins/itip-formatter/itip-formatter.c:2028
+#: ../plugins/itip-formatter/itip-formatter.c:1932
+#: ../plugins/itip-formatter/itip-formatter.c:1960
+#: ../plugins/itip-formatter/itip-formatter.c:2069
 msgid "The item in the calendar is not valid"
 msgstr "ããããããããããäæãã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1892
-#: ../plugins/itip-formatter/itip-formatter.c:1920
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:1961
+#: ../plugins/itip-formatter/itip-formatter.c:2070
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17199,11 +17293,11 @@ msgstr ""
 "ãããããããããããæäãããããããããããããããããããããããã"
 "ããäåãæçãåãããããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:1974
 msgid "The calendar attached contains multiple items"
 msgstr "æäãããããããããèæããããããåãããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1934
+#: ../plugins/itip-formatter/itip-formatter.c:1975
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17211,40 +17305,46 @@ msgstr ""
 "ãããããããããããããåçããããããããããäåããããããããããã"
 "ããããããã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2592
+#: ../plugins/itip-formatter/itip-formatter.c:2633
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ãã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2649
 msgid "Tentatively Accepted"
 msgstr "äæèæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2726
+#: ../plugins/itip-formatter/itip-formatter.c:2767
 msgid "This meeting recurs"
 msgstr "ããäèãçãèã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2729
+#: ../plugins/itip-formatter/itip-formatter.c:2770
 msgid "This task recurs"
 msgstr "ããããããçãèã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2732
+#: ../plugins/itip-formatter/itip-formatter.c:2773
 msgid "This memo recurs"
 msgstr "ãããããçãèã"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2992
+#, fuzzy
+#| msgid "Meeting Information"
+msgid "Meeting Invitations"
+msgstr "äèãæå"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2976
+#: ../plugins/itip-formatter/itip-formatter.c:3017
 msgid "_Delete message after acting"
 msgstr "äèéååãããããããåéãã(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2986
-#: ../plugins/itip-formatter/itip-formatter.c:3019
+#: ../plugins/itip-formatter/itip-formatter.c:3027
+#: ../plugins/itip-formatter/itip-formatter.c:3060
 msgid "Conflict Search"
 msgstr "éèãããããããæç"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3001
+#: ../plugins/itip-formatter/itip-formatter.c:3042
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "éèããäèãæçãããããããéæãããããã:"
 
@@ -17808,7 +17908,7 @@ msgstr ""
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "åäç (Inbox) ããããããæçããããããéçããããããããã"
 
-#: ../plugins/mail-notification/mail-notification.c:394
+#: ../plugins/mail-notification/mail-notification.c:391
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17822,56 +17922,56 @@ msgstr[0] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:419
+#: ../plugins/mail-notification/mail-notification.c:416
 #, c-format
 msgid "Subject: %s"
 msgstr "äå: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:430
+#: ../plugins/mail-notification/mail-notification.c:427
 #, 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:439
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
 #: ../plugins/mail-notification/mail-notification.c:447
-#: ../plugins/mail-notification/mail-notification.c:450
 msgid "New email"
 msgstr "æããããã"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:471
+#: ../plugins/mail-notification/mail-notification.c:468
 #, fuzzy, c-format
 msgid "Show %s"
 msgstr "èçããéç"
 
-#: ../plugins/mail-notification/mail-notification.c:673
+#: ../plugins/mail-notification/mail-notification.c:670
 #, fuzzy
 msgid "_Play sound when a new message arrives"
 msgstr "æããããããåãããæåãã(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:703
+#: ../plugins/mail-notification/mail-notification.c:700
 msgid "_Beep"
 msgstr "ãããéãéãã(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:716
+#: ../plugins/mail-notification/mail-notification.c:713
 msgid "Use sound _theme"
 msgstr "ããããããããäç(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:732
 msgid "Play _file:"
 msgstr "ãããããåç(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:744
+#: ../plugins/mail-notification/mail-notification.c:741
 msgid "Select sound file"
 msgstr "ããããããããããéæ"
 
-#: ../plugins/mail-notification/mail-notification.c:801
+#: ../plugins/mail-notification/mail-notification.c:798
 msgid "Notify new messages for _Inbox only"
 msgstr "åäçãæçãããããéçãã(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:811
+#: ../plugins/mail-notification/mail-notification.c:808
 #, fuzzy
 msgid "Show _notification when a new message arrives"
 msgstr ""
@@ -17892,7 +17992,7 @@ msgstr "æããããããåãããéçããããããã"
 msgid "Created from a mail by %s"
 msgstr "%s ãããããããããäæ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:586
+#: ../plugins/mail-to-task/mail-to-task.c:593
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -17901,7 +18001,7 @@ msgstr ""
 "éæãããããããããããã '%s' ãæãçéãããããããåããããããçé"
 "ãããã?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:589
+#: ../plugins/mail-to-task/mail-to-task.c:596
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -17910,7 +18010,7 @@ msgstr ""
 "éæããããããäèããããã '%s' ãæãçéãããããããåãããããçé"
 "ãããã?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:592
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -17919,51 +18019,51 @@ msgstr ""
 "éæãããããäèãããã '%s' ãæãçéãããããããåããããçéããã"
 "ã?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:612
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:615
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:634
+#: ../plugins/mail-to-task/mail-to-task.c:641
 #, fuzzy
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "äæããããããããããã?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:709
+#: ../plugins/mail-to-task/mail-to-task.c:716
 msgid "[No Summary]"
 msgstr "[ãããçã]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:721
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid "Invalid object returned from a server"
 msgstr "ãããããæãããããããããããèãããããã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:771
+#: ../plugins/mail-to-task/mail-to-task.c:778
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "åçäãããããççãããã: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:796
+#: ../plugins/mail-to-task/mail-to-task.c:803
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ãããããéãããã: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:803
+#: ../plugins/mail-to-task/mail-to-task.c:810
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -17971,7 +18071,7 @@ msgstr ""
 "éæããããããèãèãåçããããããããçæããããããäãããããéæ"
 "ããããããã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:806
+#: ../plugins/mail-to-task/mail-to-task.c:813
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -17979,7 +18079,7 @@ msgstr ""
 "éæããããããèãèãåçãããããããçæããããããäãããããéæã"
 "ãããããã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:809
+#: ../plugins/mail-to-task/mail-to-task.c:816
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -17987,45 +18087,45 @@ msgstr ""
 "éæããããããèãèãåçããããããçæããããããäãããããéæãã"
 "ããããã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1045
+#: ../plugins/mail-to-task/mail-to-task.c:1066
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ããããäèãååãããããã%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1104
+#: ../plugins/mail-to-task/mail-to-task.c:1127
 #, fuzzy
 msgid "No writable calendar is available."
 msgstr "èæããããããã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1196
+#: ../plugins/mail-to-task/mail-to-task.c:1219
 msgid "Create an _Event"
 msgstr "ãããããäæ(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1198
+#: ../plugins/mail-to-task/mail-to-task.c:1221
 msgid "Create a new event from the selected message"
 msgstr "éæãããããããããæãããããããäæããã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1203
+#: ../plugins/mail-to-task/mail-to-task.c:1226
 msgid "Create a Mem_o"
 msgstr "ãããäæ(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1205
+#: ../plugins/mail-to-task/mail-to-task.c:1228
 msgid "Create a new memo from the selected message"
 msgstr "éæãããããããããæãããããäæããã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1210
+#: ../plugins/mail-to-task/mail-to-task.c:1233
 msgid "Create a _Task"
 msgstr "ããããäæ(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1212
+#: ../plugins/mail-to-task/mail-to-task.c:1235
 msgid "Create a new task from the selected message"
 msgstr "éæãããããããããæããããããäæããã"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1220
+#: ../plugins/mail-to-task/mail-to-task.c:1243
 msgid "Create a _Meeting"
 msgstr "äèãäæ(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1222
+#: ../plugins/mail-to-task/mail-to-task.c:1245
 msgid "Create a new meeting from the selected message"
 msgstr "éæãããããããããæããäèãäæããã"
 
@@ -18191,7 +18291,7 @@ msgstr "ããããããããããããã(_S)"
 msgid "In Current _Folder Only"
 msgstr "ãããããããã(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:565
+#: ../plugins/mark-all-read/mark-all-read.c:573
 msgid "Mark Me_ssages as Read"
 msgstr "ããããããæèããã(_S)"
 
@@ -18270,35 +18370,31 @@ msgstr "Outlook PST ãããããã"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ãåäããããã (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:308
+#: ../plugins/pst-import/pst-importer.c:436
 msgid "_Mail"
 msgstr "ããã(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:326
+#: ../plugins/pst-import/pst-importer.c:455
 msgid "Destination folder:"
 msgstr "èéåãããã:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "_Address Book"
 msgstr "ããããå(_A)"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:339
+#: ../plugins/pst-import/pst-importer.c:462
 msgid "A_ppointments"
 msgstr "äå(_P)"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:345 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:463 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "ããã(_T)"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:464
 msgid "_Journal entries"
 msgstr "ãããããããããã(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:366
+#: ../plugins/pst-import/pst-importer.c:567
 msgid "Importing Outlook data"
 msgstr "Outlook ãããããããããä"
 
@@ -18466,62 +18562,6 @@ msgstr "æããåæ"
 msgid "Edit Location"
 msgstr "åæãçé"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "SpamAssassin ãèãããããã (ããããããã: %d)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "ããããçæãåæãããã: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "fork() ããåãããã: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "SpamAssassin ãåããããããåçãããããååçäãããã..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "SpamAssassin ãåãããããããåãèãåããåããã..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "SpamAssassin ãåããããããåæãããã (ããããããã: %d)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "SpamAssassin ãåçãããããããããããããããããããããã"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "ãããæãäéæãéããããããããäéããããã"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
-msgid "I_nclude remote tests"
-msgstr "ãããããããããããããã(_N)"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "SpamAssassin ãäããããããããããããããããããã"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "SpamAssassin ããããããããã"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin ãããããã"
-
 #. 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.
@@ -18529,81 +18569,83 @@ msgstr "SpamAssassin ãããããã"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Description List"
 msgstr "èæãäè"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Categories List"
 msgstr "ãããããäè"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Comment List"
 msgstr "ãããããäè"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Contact List"
 msgstr "éçåãäè"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Start"
 msgstr "éå"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "çä"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "ææ"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "%% åä"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Attendees List"
 msgstr "ååèãäè"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Modified"
 msgstr "åææ"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:562
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV ååãæåããããã(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Prepend a _header"
 msgstr "ããããääãã(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:577
+#: ../plugins/save-calendar/csv-format.c:579
 msgid "_Value delimiter:"
 msgstr "æåãååã(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:588
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Record delimiter:"
 msgstr "ãããããååã(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:599
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Encapsulate values with:"
 msgstr "æåãããããå(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:625
-msgid "Comma separated value format (.csv)"
+#: ../plugins/save-calendar/csv-format.c:627
+#, fuzzy
+#| msgid "Comma separated value format (.csv)"
+msgid "Comma separated values (.csv)"
 msgstr "ããããååããåå (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:166
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar åå (.ics)"
+#: ../plugins/save-calendar/ical-format.c:166 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -18623,7 +18665,9 @@ msgid "%FT%T"
 msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:375
-msgid "RDF format (.rdf)"
+#, fuzzy
+#| msgid "RDF format (.rdf)"
+msgid "RDF (.rdf)"
 msgstr "RDF åå (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:122
@@ -18689,26 +18733,26 @@ msgstr "ããããã vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "vCard ãçæãããäãèçãããã"
 
-#: ../plugins/vcard-inline/vcard-inline.c:200
-#: ../plugins/vcard-inline/vcard-inline.c:285
+#: ../plugins/vcard-inline/vcard-inline.c:206
+#: ../plugins/vcard-inline/vcard-inline.c:291
 msgid "Show Full vCard"
 msgstr "ãããã vCard ãèç"
 
-#: ../plugins/vcard-inline/vcard-inline.c:203
+#: ../plugins/vcard-inline/vcard-inline.c:209
 msgid "Show Compact vCard"
 msgstr "vCard ãèç (çæ)"
 
-#: ../plugins/vcard-inline/vcard-inline.c:264
+#: ../plugins/vcard-inline/vcard-inline.c:270
 msgid "There is one other contact."
 msgstr "äã 1åãéçåãããããã"
 
-#: ../plugins/vcard-inline/vcard-inline.c:273
+#: ../plugins/vcard-inline/vcard-inline.c:279
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "äã %dåãéçåãããããã"
 
-#: ../plugins/vcard-inline/vcard-inline.c:294
+#: ../plugins/vcard-inline/vcard-inline.c:300
 msgid "Save in Address Book"
 msgstr "ããããåãäå"
 
@@ -18979,8 +19023,8 @@ msgid ""
 "by the GNOME toolbar setting."
 msgstr ""
 "ãããããããããããããããããããããããããããããããããããããã"
-"ãããããã GNOME ãããããããèåãåããããåçåèãå: \"text"
-"\"ã\"icons\"ã\"both\"ã\"toolbar\""
+"ãããããã GNOME ãããããããèåãåããããåçåèãå: \"text\"ã"
+"\"icons\"ã\"both\"ã\"toolbar\""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
@@ -19007,7 +19051,9 @@ msgid "Use HTTP proxy"
 msgstr "HTTP ãããããåçãããããã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
+#, fuzzy
+#| msgid "User name to pass as authentication when doing HTTP proxying."
+msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "HTTP ããããççãããããããéãèèããããæããããåããã"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
@@ -19083,10 +19129,6 @@ msgstr "æçåè(_N):"
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:225
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
 #: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "ãããããããã (*)"
@@ -19098,7 +19140,7 @@ 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:648
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "çè æ <takeshi aihana gmail com>\n"
@@ -19110,280 +19152,272 @@ msgstr ""
 "OKANO Takayoshi <kano na rim or jp>\n"
 "ææGNOMEããããä <http://www.gnome.gr.jp/>"
 
-#: ../shell/e-shell-window-actions.c:659
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Evolution ããããããã"
 
-#: ../shell/e-shell-window-actions.c:921
+#: ../shell/e-shell-window-actions.c:902
 #, fuzzy
 msgid "Categories Editor"
 msgstr "ãããããäè"
 
-#: ../shell/e-shell-window-actions.c:1256
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy ããããããããããããããã"
 
-#: ../shell/e-shell-window-actions.c:1258
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy ãåèãããããããã"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "Evolution ãããããæåãèçããã"
 
-#: ../shell/e-shell-window-actions.c:1444
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "ããããããéãã(_C)"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "çæ(_C)"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
 msgstr "Evolution ããããããããéã"
 
-#: ../shell/e-shell-window-actions.c:1493
-msgid "Evolution _FAQ"
-msgstr "Evolution ã FAQ(_F)"
-
-#: ../shell/e-shell-window-actions.c:1495
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "ããããèå (FAQ) ãéããã"
-
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "ããããããæå(_F)"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "èæããããããããããããããæåãããã?"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "ããããã(_M)..."
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "äããããããããããããåãèããã"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "æããããããã(_W)"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
 msgstr "ããããããèçããæããããããããäæããã"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1502
 #, fuzzy
 msgid "Available Cate_gories"
 msgstr "åçåèãéç"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Manage available categories"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "ããããããããããã(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
 msgstr "Evolution ãããããããããããèç"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "ããããããçäããã"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "æåæç(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr "ããéåãæçãèå"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
 msgstr "ããæçæäãæåããã"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "äåããæççæãçé(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
 msgstr "äåããæçæäãçç"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "ãããããããããæçãçéãåæãããããã"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "äããæç(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
 msgstr "çåãæçæäãäåããã"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "æçæäãäå(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
 msgstr "çåãæçæäãäåããã"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "ããååãæå(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy ãäãããããååããã"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "ããããããåä(_W)"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
 msgstr "Evolution ããããããããããããã"
 
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "ããããããåä(_W)"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
 msgstr "Evolution ãããããããããããã"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "éç(_O)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "æè(_N)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "æç(_S)"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "ãããããããã(_S)"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "ããããã(_W)"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "ããããããèçãã(_B)"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
 msgstr "ããããããèçãã"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "ããããèç(_B)"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
 msgstr "åæããããèç"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "ããããããããèçãã(_S)"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
 msgstr "ããããããããèçãã"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "ããããããèç(_T)"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
 msgstr "ããããããèçãã"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "ãããããã(_I)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "ããããããäããããããããããããèçããã"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "ããããã(_T)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "ãããããäããããããããããããèçããã"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "ãããããããã(_A)"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "ãããããããããäããããããããããããèçããã"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "ãããããããããã(_B)"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ãããããããèåãåããããããããããããèçããã"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "ããããåç..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "ããããäæãããçéããã"
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "ããããèçãäå..."
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "çåãããããäåããã"
 
-#: ../shell/e-shell-window-actions.c:1808
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "çåãããã(_U)"
 
-#: ../shell/e-shell-window-actions.c:1818
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "ãããããããããã"
 
-#: ../shell/e-shell-window-actions.c:1820
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "çåãããããããããããããããããã"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
 msgstr "çåãããããããããèåãåæãã"
 
-#: ../shell/e-shell-window-actions.c:2215
+#: ../shell/e-shell-window-actions.c:2189
 #, c-format
 msgid "Switch to %s"
 msgstr "%sãåãæããã"
 
-#: ../shell/e-shell-window-actions.c:2430
+#: ../shell/e-shell-window-actions.c:2404
 msgid "Execute these search parameters"
 msgstr "ããæçæäãæçãåè"
 
@@ -19766,31 +19800,33 @@ msgstr "MD5 æç"
 
 #: ../smime/gui/certificate-manager.c:93
 #: ../smime/gui/certificate-manager.c:113
-msgid "E-Mail Address"
-msgstr "E-ãããããããã"
+#, fuzzy
+#| msgid "Email _Address:"
+msgid "Email Address"
+msgstr "E-ãããããããã(_A):"
 
-#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:570
 msgid "Select a certificate to import..."
 msgstr "ãããããããèææãéæ..."
 
-#: ../smime/gui/certificate-manager.c:587
+#: ../smime/gui/certificate-manager.c:583
 msgid "All files"
 msgstr "ãããããããã"
 
-#: ../smime/gui/certificate-manager.c:622
+#: ../smime/gui/certificate-manager.c:618
 #, fuzzy
 msgid "Failed to import certificate"
 msgstr "ããããèææãããããããåæãããã"
 
-#: ../smime/gui/certificate-manager.c:990
+#: ../smime/gui/certificate-manager.c:985
 msgid "All PKCS12 files"
 msgstr "ãããã PKCS12 ãããã"
 
-#: ../smime/gui/certificate-manager.c:1008
+#: ../smime/gui/certificate-manager.c:1003
 msgid "All email certificate files"
 msgstr "ãããã E-ãããèèãããã"
 
-#: ../smime/gui/certificate-manager.c:1026
+#: ../smime/gui/certificate-manager.c:1021
 msgid "All CA certificate files"
 msgstr "ãããã CA èèãããã"
 
@@ -20546,7 +20582,7 @@ msgstr "äçããæåéåãæåãããããã"
 msgid "Other..."
 msgstr "ããä..."
 
-#: ../widgets/misc/e-contact-map-window.c:347
+#: ../widgets/misc/e-contact-map-window.c:355
 #, fuzzy
 msgid "Contacts Map"
 msgstr "éçåãåå"
@@ -20736,48 +20772,48 @@ msgstr "ãããããããæçãããããããEvolution ãçåã
 msgid "Evolution Preferences"
 msgstr "Evolution ãèå"
 
-#: ../widgets/misc/e-search-bar.c:79
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "æççæ: %då"
 
-#: ../widgets/misc/e-search-bar.c:561
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "æçãããéããã"
 
-#: ../widgets/misc/e-search-bar.c:569
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "æç(_D):"
 
-#: ../widgets/misc/e-search-bar.c:581
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "æçãããã"
 
-#: ../widgets/misc/e-search-bar.c:605
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "åã(_P)"
 
-#: ../widgets/misc/e-search-bar.c:611
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "ãããããåãåçäçãæç"
 
-#: ../widgets/misc/e-search-bar.c:624
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "æã(_N)"
 
-#: ../widgets/misc/e-search-bar.c:630
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr "ãããããæãåçäçãæç"
 
-#: ../widgets/misc/e-search-bar.c:643
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr "åæååæåãååããäè(_C)"
 
-#: ../widgets/misc/e-search-bar.c:671
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr "ããããæåãåéãããããåéããçèããã"
 
-#: ../widgets/misc/e-search-bar.c:693
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr "ããããåéãåéãããããæåããçèããã"
 
@@ -20969,51 +21005,51 @@ msgstr "ãããããããããããåèåèããããããããã
 msgid "Click here to go to URL"
 msgstr "ãããããããããã URL ãããããããã"
 
-#: ../widgets/misc/e-web-view.c:408
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "ãããåãããã(_C)"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "ãããåãããããããããããããããã"
 
-#: ../widgets/misc/e-web-view.c:418
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "ãããããããããéã(_O)"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "ãããããããããéããã"
 
-#: ../widgets/misc/e-web-view.c:428
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "E-ãããããããããããã(_C)"
 
-#: ../widgets/misc/e-web-view.c:445
+#: ../widgets/misc/e-web-view.c:447
 #, fuzzy
 msgid "_Copy Image"
 msgstr "çåãã(_N)"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:449
 #, fuzzy
 msgid "Copy the image to the clipboard"
 msgstr "ãããåãããããããããããããããã"
 
-#: ../widgets/misc/e-web-view.c:467 ../widgets/misc/e-web-view.c:1292
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
 msgid "Select all text and images"
 msgstr "ãããããããããçåãéæããã"
 
-#: ../widgets/misc/e-web-view.c:956 ../widgets/misc/e-web-view.c:958
-#: ../widgets/misc/e-web-view.c:960
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "ããããããã %s ãããåãåããã"
 
-#: ../widgets/misc/e-web-view.c:962
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
 msgstr "ããããããã E-ãããããããããèç/éèçãåãæããã"
 
-#: ../widgets/misc/e-web-view.c:964
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
 msgstr "ããããããã %s ãéããã"
@@ -21306,6 +21342,147 @@ msgstr "ãããéæ"
 msgid "Input Methods"
 msgstr "ååãããã"
 
+#~ msgid "Edit Alarm"
+#~ msgstr "ãããããçé"
+
+#~ msgid "Add Alarm"
+#~ msgstr "ãããããèå"
+
+#~ msgid "Alarm"
+#~ msgstr "ãããã"
+
+#~ msgid "Alarms"
+#~ msgstr "ãããã"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "ããããããããéããã"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "åçåèãããããèçããã"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "ããååãäåããã"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "ãããããæäããã"
+
+#~ msgid "_Alarms"
+#~ msgstr "ãããã(_A)"
+
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "ãã"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "ããããããããã:"
+
+#~ msgid "_Alarm"
+#~ msgstr "ãããã(_A)"
+
+#~ msgid "_Group:"
+#~ msgstr "ãããã(_G):"
+
+#~ msgid "It has alarms."
+#~ msgstr "ããããããã"
+
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "ãããããã"
+
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "çåãããããããããããããéæããããããã"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "ããããããããããã(_D):"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "ãããããæçãåçãã(_U):"
+
+#~ msgid "Alarm programs"
+#~ msgstr "ãããããããããã"
+
+#~ msgid "Save as iCalendar..."
+#~ msgstr "iCalendar ååãäå..."
+
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "ãã"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "\"%s\" ããããããããããããããããåçåèããããããã"
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr ""
+#~ "\"%s\" ãããããããåçããããã (ãããããããããããããããããã"
+#~ "çèãããããã)ã"
+
+#~ msgid "No junk plugin available"
+#~ msgstr "ããããååãããããããåçããããã"
+
+#~ msgid "Bogofilter is not available. Please install it first."
+#~ msgstr "Bogofilter ãåçããããããæåãããããããããããããã"
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "%s ãåãããããåèããéãããããççãããã: %s"
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "Bogofilter ãåããããããåçãããããååçäãããããã..."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr "Bogofilter ãåãããããããåãèãåããåããã..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "Bogofilter ãåããããããåæãããã (ããããããã: %d)"
+
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Bogofilter ãããããããã"
+
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "Bogofilter ãäããããããããããããããããããã"
+
+#~ msgid "Use _SSL"
+#~ msgstr "SSL ãäçãã(_S)"
+
+#~ msgid "_Secure connection"
+#~ msgstr "ãããããæçãåçãã(_S)"
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "SpamAssassin ãèãããããã (ããããããã: %d)"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "ããããçæãåæãããã: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "fork() ããåãããã: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "SpamAssassin ãåããããããåçãããããååçäãããã..."
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr "SpamAssassin ãåãããããããåãèãåããåããã..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "SpamAssassin ãåããããããåæãããã (ããããããã: %d)"
+
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr "SpamAssassin ãåçãããããããããããããããããããããã"
+
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "SpamAssassin ããããããããã"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "iCalendar åå (.ics)"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "Evolution ã FAQ(_F)"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "ããããèå (FAQ) ãéããã"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "E-ãããããããã"
+
 #~ msgid "Invalid object"
 #~ msgstr "çåããããããã"
 
@@ -21559,9 +21736,6 @@ msgstr "ååãããã"
 #~ msgid "Con_tacts..."
 #~ msgstr "éçå(_T)..."
 
-#~ msgid "Shared Folder Notification"
-#~ msgstr "åæãããããéç"
-
 #~ msgid "Users:"
 #~ msgstr "ããã:"
 
@@ -21586,9 +21760,6 @@ msgstr "ååãããã"
 #~ msgid "Read items marked _private"
 #~ msgstr "private ãããããäãããããããèãèã(_P)"
 
-#~ msgid "Reminder Notes"
-#~ msgstr "èãæã"
-
 #~ msgid "Subscribe to my _alarms"
 #~ msgstr "èåã alarm ãçéãã(_A)"
 
@@ -21888,9 +22059,6 @@ msgstr "ååãããã"
 #~ msgid "%s has published meeting information."
 #~ msgstr "%s ãããäèãæåãåéããããã"
 
-#~ msgid "Meeting Information"
-#~ msgstr "äèãæå"
-
 #~ msgid "%s requests the presence of %s at a meeting."
 #~ msgstr "%s ããã %s ãäèããååãèæããããããã"
 



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