[evolution] Updatd Korean translation

From: Changwoo Ryu <cwryu src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updatd Korean translation
Date: Sat, 11 Sep 2010 10:12:57 +0000 (UTC)
commit 7dfa7565a010ff26cc21226b5b928bad0a0c53a9
Author: Changwoo Ryu <cwryu debian org>
Date:   Sat Sep 11 19:12:33 2010 +0900

    Updatd Korean translation

 po/ko.po |10570 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 4900 insertions(+), 5670 deletions(-)
---
diff --git a/po/ko.po b/po/ko.po
index 1ebf1d7..f2e8c5b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,6 +9,7 @@
 # ì°¸ê³ :
 # - ì?´ í??ë¡?ê·¸ë?¨ì?? ì?´ë¦?ì?¸ Evolutionì?? "ì??ë³¼ë£¨ì??"ì?¼ë¡? ì??ì?.
 # - ê¸°í?? í??ë¡?ê·¸ë?¨ ì?ì?? ë?¤ì??ê³¼ ê°?ì?´ ì??ì?:
+#   - Anjal -> ì?¤ì ?ì?¼
 #   - Bogofilter -> ë³´ê³ í??í?°
 #   - SpamAssassin -> ì?¤í?¸ì?´ì??ì? 
 # - "ì??ë¬´ê°? wrote:", "---Original Message---", "---Forwarded Message---"
@@ -29,18 +30,21 @@
 #   - reminder -> ë¯¸ë¦¬ ì??ë¦¼
 #   - task -> ì??ì??
 # - ê¸°í?? ì?©ì?´
+#   - read receipt -> ë?´ì?© ì?½ì?? í??ì?¸
 #   - online/offline -> ì?°ê²° ì??í??/ì?°ê²° ì¤?ì§? ì??í??
-#   - Anjal -> ì?¤ì ?ì?¼
-#
-#: ../shell/main.c:479
+#   - day view -> ì?¼ë³? ë³´ê¸°
+#   - work week view -> ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°
+#   - date navigator -> ë? ì§? ì? í?? ë?¬ë ¥
+#: ../shell/main.c:534
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2010-03-13 19:03+0900\n"
-"PO-Revision-Date: 2010-03-20 16:52+0900\n"
+"POT-Creation-Date: 2010-09-11 19:11+0900\n"
+"PO-Revision-Date: 2010-09-11 19:12+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu debian org>\n"
 "Language-Team: GNOME Korea <gnome-kr googlegroups com>\n"
+"Language: Korean\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -112,41 +116,46 @@ msgid "Delete address book '{0}'?"
 msgstr "'{0}' ì£¼ì??ë¡?ì?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "ì?ì ?í??ì§? ì??ê¸°(_N)"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0}ì??(ë¥¼) {1}ì?? ì ?ì?¥í??ë??ë?° ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP ì??ë²?ì??ì?? ì?¸ì¦?ì?´ ì?¤í?¨í??ì?µë??ë?¤."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "ì?°ë?½ì²?ë¥¼ ì?ì ?í??ë??ë?° ì?¤í?¨í??ì?µë??ë?¤"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "ê·¸ë£¹ì??ì?´ì¦? ì£¼ì??ë¡? ë§?ë?¤ê¸°:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP ì??ë²?ê°? ì?¬ë°?ë¥¸ ì?¤í?¤ë§? ì ?ë³´ê°? ë?¤ì?´ ì??ë?? ì??ë?µì?? í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr "ì?´ ì??ë²?ì??ì??ë?? ì?¼ë¶? ê¸°ë?¥ì?´ ì ?ë??ë¡? ë??ì??í??ì§? ì??ì?? ì??ë?? ì??ì?µë??ë?¤"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "ì??ë³¼ë£¨ì?? ì£¼ì??ë¡?ì?´ ì??ì??ì¹? ëª»í??ê²? ë??ë?¬ì?µë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "ì? í??í?? ê·¸ë¦¼ í?¬ê¸°ê°? í?½ë??ë?¤. í?¬ê¸°ë¥¼ ì¡°ì ?í?´ì?? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -155,15 +164,15 @@ msgstr ""
 "LDAP ì??ë²?ê°? ì?´ ê¸°ë?¥ì?? ì§?ì??í??ì§? ì??ë?? LDAP ê³¼ê±° ë²?ì ?ì?? ì?¬ì?©í?  ì??ë?? ì??ê³ , ì?¤ì ?"
 "ì?´ í??ë ¸ì?? ì??ë?? ì??ì?µë??ë?¤. ì§?ì??í??ë?? ê²?ì?? ê¸°ì¤?ì?? ë??í?´ ê´?ë¦¬ì??ì??ê²? ë¬¸ì??í??ì?ì??ì?¤."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "ì?´ ì£¼ì??ë¡?ì?? ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr "ì ?ì??í??ì?  ê²?ì?? ê¸°ì¤? ì¤?ì??ì?? ì£¼ì??ë¡? ì??ë²?ì?? ì??ë¬´ ê²?ë?? ì??ì?µë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -171,31 +180,31 @@ msgstr ""
 "ì£¼ì??ë¡? ì??ë²?ì?? ì ?ê·¼í?  ì?? ì??ê±°ë?? ì??ë²? ì?´ë¦?ì?? ì??ëª» ì??ë ¥í??ì?? ê±°ë?? ë?¤í?¸ì??í?¬ ì?°ê²°"
 "ì?´ ë??ì?´ì¡?ì?? ê²?ì??ë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "ì£¼ì??ë¡?ì?? ì??ì??í?? ì ?ê±°í?©ë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "ì?´ ì??ë²?ë?? LDAPv3 ì?¤í?¤ë§? ì ?ë³´ë¥¼ ì§?ì??í??ì§? ì??ì?µë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "ì£¼ì??ë¡?ì?? ì?´ ì?? ì??ì?µë??ë?¤"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "ê²?ì??ì?? ì??í??í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "{0}ì??(ë¥¼) ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "ë°?ë?? ë¶?ë¶?ì?? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -203,7 +212,7 @@ msgstr ""
 "ì?°ë?½ì²?ë¥¼ í?? ì£¼ì??ë¡?ì??ì?? ë?¤ë¥¸ ì£¼ì??ë¡?ì?¼ë¡? ì?®ê¸°ë ¤ê³  í??ì§?ë§? ì??ë?? ì£¼ì??ë¡?ì??ì?? ì?°ë?½ì²?"
 "ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤. ì?®ê¸°ë?? ë??ì? ì?? ë³µì?¬í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -213,72 +222,48 @@ msgstr ""
 "ì ?ê°? ë°?ì??í?  ì??ë?? ì??ì?µë??ë?¤. ì??ë²?ë¥¼ ì§?ì??í??ë?? ë²?ì ?ì?¼ë¡? ì??ê·¸ë ?ì?´ë??í??ë?? ê²? ê°?ì?¥ ì¢?"
 "ì?µë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ì?´ ì£¼ì??ë¡?ì?? ì?°ë?½ì²?ë¥¼ ì§?ì?¸ ê¶?í??ì?´ ì??ì?µë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "ì?´ ì?°ë?½ì²?ì?? ë°?ë?? ë¶?ë¶?ì?´ ì??ì?µë??ë?¤. ë°?ë?? ì?¬í?ì?? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "ì??ë³¼ë£¨ì??ì?? ë?¤ì?? ì??ì??í?  ë?? ê¹?ì§?ë?? {0}ì?? ë??í?? ì?°ë?½ì²?ë¥¼ ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "ì¶?ê°?(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "ë²?ë¦¬ê¸°(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "ì ?ì?¥í??ì§? ì??ê¸°(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "í?¬ê¸° ì¡°ì ?(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "ê·¸ë??ë¡? ì?¬ì?©(_U)"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "ê¸°ë³¸ ë??ê¸°í?? ì£¼ì??:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "ì£¼ì??ë¡?ì?? ì?½ì?´ë?¤ì?¼ ì?? ì??ì?µë??ë?¤"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "í??ì?¼ë¡¯ì?? Address í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2020
 msgid "Anniversary"
 msgstr "ê¸°ë??ì?¼"
 
@@ -289,354 +274,305 @@ msgstr "ê¸°ë??ì?¼"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2019 ../capplet/anjal-settings-main.c:117
+#: ../shell/main.c:122
 msgid "Birthday"
 msgstr "ì??ì?¼"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "ë¸?ë¡?ê·¸:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "ë¶?ë¥?(_T)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "ë?¬ë ¥:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "ì?°ë?½ì²?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
 msgid "Contact Editor"
 msgstr "ì?°ë?½ì²? í?¸ì§?ê¸°"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "ì ?ì??ë©?ì?¼"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "ì?½ì?? ì??ì??/ì??ì??:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "ì ?ì²´ ì?´ë¦?(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "ì§?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "í??í??ì?´ì§?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "ê·¸ë¦¼"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "ì?¸ì?¤í?´ì?¤ ë©?ì??ì§?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "ì??ë¬´"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "ë©?ì?¼ë§? ì£¼ì??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "ê¸°í??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "ë³?ëª?(_K):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "ìª½ì§?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1725
 msgid "Other"
 msgstr "ê¸°í??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "ê°?ì?¸ ì ?ë³´"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "ì ?í??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "í??ì?? ë??í??:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "ì?¹ ì£¼ì??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "ì?¹ë¡?ê·¸:"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "ì?¹ ì£¼ì??"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "ì??ë¬´"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "ì£¼ì??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "ê¸°ë??ì?¼(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "ë¹?ì??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "ì??ì?¼(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "ë¸?ë¡?ê·¸(_B):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "ë?¬ë ¥(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "ë??ì??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "í??ì?¬(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "êµê°?(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "ë¶?ì??(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "í??ì?¼ ì?´ë¦?(_F):"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "ì?½ì?? ì??ì??/ì??ì??(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "í??í??ì?´ì§?(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "ê´?ë¦¬ì??(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "ì?¬ë¬´ì?¤(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "ì?¬ì??í?¨(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "ì§?ì±?(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "ë°°ì?°ì??(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "ì??/ë??(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "ì§?ì??(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "í??ì?? ë??í??(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "HTML ë©?ì?¼ ë°?ì??(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "ì?¹ë¡?ê·¸(_W):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "ì??ì¹?(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "ì?°í?¸ ë²?í?¸(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "ì?´ë¦?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "í?¸ì§? ê°?ë?¥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "ì?¬ë²?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "ì?¼í??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "ê°?ë??ê°?ë??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "ê·¸ë£¹ì??ì?´ì¦?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "ì?¤ì¹´ì?´í??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 msgid "Error adding contact"
 msgstr "ì?°ë?½ì²?ë¥¼ ì¶?ê°?í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
 msgid "Error modifying contact"
 msgstr "ì?°ë?½ì²?ë¥¼ ì??ì ?í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
 msgid "Error removing contact"
 msgstr "ì?°ë?½ì²?ë¥¼ ì ?ê±°í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "ì??ë³¸ ì£¼ì??ë¡?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "ë??ì?? ì£¼ì??ë¡?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "ì?? ì?°ë?½ì²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "ì?°ê¸° ê°?ë?¥í?? í?ëª©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "í??ì?? í?ëª©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "ë°?ë??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "ì?°ë?½ì²? í?¸ì§? - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
 msgid "Please select an image for this contact"
 msgstr "ì?´ ì?°ë?½ì²?ì?? ì?¬ì?©í?  ê·¸ë¦¼ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
 msgid "_No image"
 msgstr "ê·¸ë¦¼ ì??ì??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -644,56 +580,46 @@ msgstr ""
 "ì?°ë?½ì²? ë?°ì?´í?°ê°? ì??ëª»ë??ì??ì?µë??ë?¤:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'ì?? ì??ëª»ë?? í??ì??ì?´ ë?¤ì?´ ì??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'ì?? ì??ëª»ë?? í??ì??ì?´ ë?¤ì?´ ì??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s'ì?´(ê°?) ë¹?ì?´ ì??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
 msgid "Invalid contact."
 msgstr "ì?°ë?½ì²?ê°? ì??ëª»ë??ì??ì?µë??ë?¤."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "ì?°ë?½ì²? ë¹ ë¥¸ ì¶?ê°?"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "ì ?ì?? ì?´ë¦? í?¸ì§?(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "ì ?ì²´ ì?´ë¦?(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "ì ?ì?? ë©?ì?¼(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "ì£¼ì??ë¡? ì? í??(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "ì?¸"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "EShell ì?±ê¸?í?¤"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -761,7 +687,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:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
 msgid "Contact List Editor"
 msgstr "ì?°ë?½ì²? ëª©ë¡? í?¸ì§?ê¸°"
 
@@ -771,14 +697,14 @@ msgstr "êµ¬ì?±ì??"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
-msgstr "ì?´ ëª©ë¡?ì?¼ë¡? ë©?ì?¼ì?? ë³´ë?¼ ë?? ì£¼ì??ë¥¼ ì?¨ê¹?ë??ë?¤(_H)"
+msgstr "ì?´ ëª©ë¡?ì?¼ë¡? ë©?ì?¼ ë³´ë?¼ ë?? ì£¼ì?? ì?¨ê¸°ê¸°(_H)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "ëª©ë¡? ì?´ë¦?(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:173
 msgid "_Select..."
 msgstr "ì? í??(_S)..."
 
@@ -786,39 +712,27 @@ msgstr "ì? í??(_S)..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "ë©?ì?¼ì£¼ì??ë¥¼ ì??ë ¥í??ê±°ë?? ì?°ë?½ì²?ë¥¼ ì??ë??ì?? ëª©ë¡?ì?¼ë¡? ë??ì?´ ë?¹ê¸°ì?ì??ì?¤(_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
 msgid "Contact List Members"
 msgstr "ì?°ë?½ì²? ëª©ë¡? êµ¬ì?±ì??"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
 msgid "_Members"
 msgstr "êµ¬ì?±ì??(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 msgid "Error adding list"
 msgstr "ëª©ë¡?ì?? ì¶?ê°?í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error modifying list"
 msgstr "ëª©ë¡?ì?? ì??ì ?í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error removing list"
 msgstr "ëª©ë¡?ì?? ì ?ê±°í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "ë¶?"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "ì?? ëª©ë¡?"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "ë°?ë?? ì?°ë?½ì²?:"
@@ -857,137 +771,113 @@ msgstr ""
 "ê·¸ë??ë?? ì?°ë?½ì²?ë¥¼ ì¶?ê°?í??ì??ê² ì?µë??ê¹??"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "í?©ì¹?ê¸°(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "ì·¨ì??í?¨"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 msgid "Merge Contact"
 msgstr "ì?°ë?½ì²? í?©ì¹?ê¸°"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../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
 msgid "Any field contains"
 msgstr "í??ë??ì?? í?¬í?¨"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 msgid "Email begins with"
 msgstr "ë©?ì?¼ ì£¼ì?? ì??ì??"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Name contains"
 msgstr "ì?´ë¦?ì?? í?¬í?¨"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "ì?°ë?½ì²? ì??ì??"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "ì?°ë?½ì²? %dê°?"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
 msgid "Error getting book view"
 msgstr "ì£¼ì??ë¡? ë³´ê¸°ë¥¼ ê°?ì ¸ì?¤ë??ë?° ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "ì¿¼ë¦¬"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
 msgstr "ê²?ì?? ì¤?ë?¨"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "ëª¨ë?¸"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "ì¹´ë??ë¥¼ ì??ì ?í??ë??ë?° ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Cut selected contacts to the clipboard"
 msgstr "ì? í??í?? ì?°ë?½ì²?ë¥¼ í?´ë¦½ë³´ë??ë¡? ì??ë?¼ë??ë??ë?¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Copy selected contacts to the clipboard"
 msgstr "ì? í??í?? ì?°ë?½ì²?ë¥¼ í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:638
 msgid "Paste contacts from the clipboard"
 msgstr "í?´ë¦½ë³´ë??ì??ì?? ì?°ë?½ì²?ë¥¼ ë¶?ì?¬ ë?£ì?µë??ë?¤"
 
 # tooltip
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "ì? í??í?? ì?°ë?½ì²?ë¥¼ ì?ì ?í?©ë??ë?¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
 msgstr "ë³´ì?´ë?? ëª¨ë?  ì?°ë?½ì²? ì? í??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "ì?¸ ë³´ê¸°:"
-
-# FIXME - ë¬´ì?¨ ë?»?
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "ì??ì?¤"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "ì ?ë§?ë¡? ì?´ ì?°ë?½ì²? ëª©ë¡?ì?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "ì ?ë§?ë¡? ì?´ ì?°ë?½ì²? ëª©ë¡?ì?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "ì ?ë§?ë¡? ì?°ë?½ì²? ëª©ë¡?ì?? (%s) ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "ì ?ë§?ë¡? ì?´ ì?°ë?½ì²?ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "ì ?ë§?ë¡? ì?´ ê³?ì ?ì?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "ì ?ë§?ë¡? ì?°ë?½ì²?ë¥¼ (%s) ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -996,11 +886,11 @@ msgstr ""
 "ì?°ë?½ì²? %dê°?ë¥¼ ì?´ë©´ %dê°?ì?? ì?? ì°½ì?? ì?´ê²? ë?©ë??ë?¤.\n"
 "ì ?ë§?ë¡? ì?´ ì?°ë?½ì²?ë¥¼ ëª¨ë?? ì?¬ì??ê² ì?µë??ê¹??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 msgid "_Don't Display"
 msgstr "í??ì??í??ì§? ì??ê¸°(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "Display _All Contacts"
 msgstr "ëª¨ë?  ì?°ë?½ì²? í??ì??(_A)"
 
@@ -1034,7 +924,7 @@ msgid "Car Phone"
 msgstr "ì¹´í?°"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 #: ../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
@@ -1136,7 +1026,7 @@ msgid "Radio"
 msgstr "ë¬´ì? "
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "ì?í? "
@@ -1161,7 +1051,6 @@ msgid "Telex"
 msgstr "í??ë ?ì?¤"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "ì§?ì??"
 
@@ -1174,59 +1063,7 @@ msgstr "êµ¬ì?± ë?¨ì??"
 msgid "Web Site"
 msgstr "ì?¹ ì?¬ì?´í?¸"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "ë??ë¹?"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "ë??ì?´"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "í?¬ì»¤ì?¤ê°? ì??ë??ì§?"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "í?ëª©"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "í?ëª© ì?´ë¦?"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "í??ì?¤í?¸ ëª¨ë?¸"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "ìµ?ë?? í??ë?? ì?´ë¦? ê¸¸ì?´"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "ì?´ ë??ë¹?"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1236,7 +1073,7 @@ msgstr ""
 "\n"
 "ì?°ë?½ì²?ë¥¼ ì°¾ë?? ì¤?ì??ë??ë?¤..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1250,7 +1087,7 @@ msgstr ""
 "\n"
 "ì?? ì?°ë?½ì²?ë¥¼ ë§?ë?¤ë ¤ë©´ ë§?ì?°ì?¤ë¥¼ ë??ë²? ë??ë¥´ì?ì??ì?¤."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1264,7 +1101,7 @@ msgstr ""
 "\n"
 "ì?? ì?°ë?½ì²?ë¥¼ ë§?ë?¤ë ¤ë©´ ë§?ì?°ì?¤ë¥¼ ë??ë²? ë??ë¥´ì?ì??ì?¤."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1274,7 +1111,7 @@ msgstr ""
 "\n"
 "ì?°ë?½ì²? ê²?ì??."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1284,11 +1121,6 @@ msgstr ""
 "\n"
 "ì?¬ê¸°ì??ì?? ë³¼ ì?? ì??ë?? í?ëª©ì?´ ì??ì?µë??ë?¤."
 
-# FIXME - ë¬´ì?¨ ë?»?
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "ì?´ë??í?°"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "ì??ë¬´ ì ?ì??ë©?ì?¼"
@@ -1298,21 +1130,13 @@ msgid "Home Email"
 msgstr "ì§? ì ?ì??ë©?ì?¼"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "ê¸°í?? ì ?ì??ë©?ì?¼"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "ì? í??ë?¨"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "ì»¤ì??ê°? ì??ë?? ì§?"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "ì??ë³¼ë£¨ì?? ì£¼ì??ë¡?"
 
@@ -1324,7 +1148,7 @@ msgstr "ì?? ì?°ë?½ì²?"
 msgid "New Contact List"
 msgstr "ì?? ì?°ë?½ì²? ëª©ë¡?"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1352,17 +1176,17 @@ msgstr "ì ?ì??ë©?ì?¼ ì£¼ì?? ë³µì?¬(_E)"
 
 # tooltip
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:396
 msgid "Copy the email address to the clipboard"
 msgstr "ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:401
 msgid "_Send New Message To..."
 msgstr "ì?? ë©?ì??ì§? ë³´ë?´ê¸°(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:403
 msgid "Send a mail message to this address"
 msgstr "ì ?ì??ë©?ì?¼ ë©?ì??ì§?ë¥¼ ì?´ ì£¼ì??ë¡? ë³´ë??ë??ë?¤"
 
@@ -1399,23 +1223,23 @@ msgid "Video Chat"
 msgstr "í??ì?? ë??í??"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:499
 msgid "Calendar"
 msgstr "ë?¬ë ¥"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ì?½ì?? ì??ì??/ì??ì??"
@@ -1443,21 +1267,19 @@ msgid "Web Log"
 msgstr "ì?¹ë¡?ê·¸"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-migrate.c:156
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:121
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "ê°?ì?¸"
@@ -1474,119 +1296,13 @@ msgstr "í??í??ì?´ì§?"
 msgid "Blog"
 msgstr "ë¸?ë¡?ê·¸"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:853
 #, c-format
 msgid "Click to mail %s"
 msgstr "ë©?ì?¼ì?? %s ì£¼ì??ë¡? ë³´ë?´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "ì?±ê³µí??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "ë°±ì??ë??ë¥¼ ì?¬ì?© ì¤?ì??ë??ë?¤"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "ì ?ì?¥ê³ ê°? ì?°ê²°ë??ì§? ì??ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "ì£¼ì??ë¡?ì?´ ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "ë?´ ì?°ë?½ì²?ë¥¼ ì ?ì??í??ì§? ì??ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "ê¶?í??ì?´ ê±°ë¶?ë??ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "ì?°ë?½ì²?ë¥¼ ì°¾ì?? ì?? ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "ì?°ë?½ì²? ì??ì?´ë??ê°? ì?´ë¯¸ ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "í??ë¡?í? ì½?ì?´ ì§?ì??ë??ì§? ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "ì·¨ì??í?¨"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "ì·¨ì??í?  ì?? ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "ì?¸ì¦?ì?´ ì?¤í?¨í??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "ì?¸ì¦?ì?´ í??ì??í?©ë??ë?¤"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLSë¥¼ ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "ê·¸ë?° ì??ì?¤ê°? ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "ì?°ê²° ì¤?ì§? ì??í??ì??ì??ë?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "ê¸°í?? ì?¤ë¥?"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "ì??ë²? ë²?ì ?ì?´ ì??ëª»ë??ì??ì?µë??ë?¤"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "ì§?ì??í??ì§? ì??ë?? ì?¸ì¦? ë°©ì??"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1596,7 +1312,7 @@ msgstr ""
 "ì??í??ì§? ì??ì??ê±°ë?? ì??ì§? ì?°ê²° ì¤?ì§? ì??í??ì??ì?? ì?¬ì?©í?  ì?? ì??ê²? ë?¤ì?´ë¡?ë??í??ì§? ì??ì?? ì??í??"
 "ì??ë??ë?¤. ì?¨ë?¼ì?¸ ëª¨ë??ì??ì?? ì£¼ì??ë¡?ì?? ë?¤ì?? ì?½ì?´ë?¤ì?¬ì?? ê·¸ ë?´ì?©ì?? ë?¤ì?´ë¡?ë??í??ì?ì??ì?¤."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1605,7 +1321,7 @@ msgstr ""
 "ì?´ ì£¼ì??ë¡?ì?? ì?´ ì?? ì??ì?µë??ë?¤.  í?´ë?¹ ê²½ë¡?ê°? (%s) ì??ê³  ê·¸ ê²½ë¡?ì?? ì ?ê·¼í?  ê¶?í??ì?´ ì??"
 "ë??ì§? í??ì?¸í??ì?ì??ì?¤."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:92
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1613,7 +1329,7 @@ msgstr ""
 "ì?´ ì??ë³¼ë£¨ì?? ë²?ì ?ì??ë?? LDAP ì§?ì?? ê¸°ë?¥ì?? ì»´í??ì?¼í??ì§? ì??ì??ì?µë??ë?¤.  LDAPì?? ì?¬ì?©í??ë ¤"
 "ë©´ LDAPì?? ì§?ì??í??ë?? ì??ë³¼ë£¨ì??ì?? ì?¤ì¹?í?´ì?¼ í?©ë??ë?¤."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1621,11 +1337,11 @@ msgstr ""
 "ì?´ ì£¼ì??ë¡?ì?? ì?´ ì?? ì??ì?µë??ë?¤.  ì??ëª»ë?? URIë¥¼ ì??ë ¥í??ê±°ë??, í?´ë?¹ ì??ë²?ì?? ì?°ê²°í?  ì?? "
 "ì??ì?µë??ë?¤."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 msgid "Detailed error message:"
 msgstr "ì??ì?¸í?? ì?¤ë¥? ë©?ì??ì§?:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1637,7 +1353,7 @@ msgstr ""
 "ì¢? ë?? êµ¬ì²´ì ?ì?¼ë¡? ì°¾ê±°ë?? ì£¼ì??ë¡?ì?? ë??ë ?í?°ë¦¬ ì??ë²? ê¸°ë³¸ ì?¤ì ?ì??ì?? \n"
 "ê²°ê³¼ì?? í??ê³?ì¹?ë¥¼ ì§?ì ?í??ì?ì??ì?¤."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1648,46 +1364,52 @@ msgstr ""
 "ë??ì??ì?µë??ë?¤.  ì¢? ë?? êµ¬ì²´ì ?ì?¼ë¡? ì°¾ê±°ë?? ì£¼ì??ë¡?ì?? ë??ë ?í?°ë¦¬ ì??ë²? ê¸°ë³¸ ì?¤ì ?ì??ì??\n"
 "ì??ê°? ì ?í??ì?? ë??ë ¤ ë³´ì?ì??ì?¤."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "ì?´ ì£¼ì??ë¡?ì?? ë°±ì??ë??ì??ì?? ì?´ ì§?ì??ë¥¼ í??ì?±í?  ì?? ì??ì?µë??ë?¤."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "ì?´ ì£¼ì??ë¡?ì?? ë°±ì??ë??ì??ì?? ì?´ ì§?ì??ë¥¼ í??ì?±í?  ì?? ì??ì?µë??ë?¤. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
-msgstr "ì?´ ì£¼ì??ë¡?ì?? ë°±ì??ë??ì??ì?? ì?´ ì§?ì??ë¥¼ ì??í??í??ê¸¸ ê±°ë¶?í??ì?µë??ë?¤."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "ì?´ ì£¼ì??ë¡?ì?? ë°±ì??ë??ì??ì?? ì?´ ì§?ì??ë¥¼ ì??í??í??ê¸¸ ê±°ë¶?í??ì?µë??ë?¤. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "ì?´ ì§?ì??ê°? ì?±ê³µì ?ì?¼ë¡? ë??ë??ì§? ì??ì??ì?µë??ë?¤."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "ì?´ ì§?ì??ê°? ì?±ê³µì ?ì?¼ë¡? ë??ë??ì§? ì??ì??ì?µë??ë?¤. %s"
 
 # í??ì?¼ ì?´ë¦?
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "card.vcf"
 msgstr "ì¹´ë??.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Select Address Book"
 msgstr "ì£¼ì??ë¡? ì? í??"
 
 # í??ì?¼ ì?´ë¦?
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:286
 msgid "list"
 msgstr "ëª©ë¡?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:425
 msgid "Move contact to"
 msgstr "ì?°ë?½ì²? ì?´ë??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
 msgid "Copy contact to"
 msgstr "ì?°ë?½ì²? ë³µì?¬"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
 msgid "Move contacts to"
 msgstr "ì?°ë?½ì²? ì?´ë??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Copy contacts to"
 msgstr "ì?°ë?½ì²? ë³µì?¬"
 
@@ -1695,54 +1417,61 @@ msgstr "ì?°ë?½ì²? ë³µì?¬"
 msgid "Card View"
 msgstr "ì¹´ë??: "
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ê°?ì ¸ì?¤ë?? ì¤?..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "ì??ì??ë£© CSV í?¹ì?? TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "ì??ì??ë£© CSV ë°? TAB ê°?ì ¸ì?¤ê¸°"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "ëª¨ì§?ë?¼ CSV í?¹ì?? TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "ëª¨ì§?ë?¼ CSV ë°? TAB ê°?ì ¸ì?¤ê¸°"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "ì??ë³¼ë£¨ì?? CSV í?¹ì?? TAB (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "ì??ë³¼ë£¨ì?? CSV ë°? TAB ê°?ì ¸ì?¤ê¸°"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ë?°ì?´í?° êµ?í?? í??ì?? (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "ì??ë³¼ë£¨ì?? LDIF ê°?ì ¸ì?¤ê¸°"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "ì??ë³¼ë£¨ì?? vCard ê°?ì ¸ì?¤ê¸°"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+msgid "Page %d"
+msgstr "í??ì?´ì§? %d"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1819,21 +1548,21 @@ msgstr "ì²?ë¦¬í??ì§? ëª»í?? ì?¤ë¥?"
 msgid "Accessing LDAP Server anonymously"
 msgstr "ì?µëª?ì?¼ë¡? LDAP ì??ë²? ì?¬ì?©"
 
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "ì?¸ì¦?í??ë??ë?° ì?¤í?¨í??ì?µë??ë?¤.\n"
 
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s(ì?¬ì?©ì?? %s)ì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:53
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1859,16 +1588,16 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
 "ì?½ì??ì?? ì??ë¯¸ì??ë?? ì??ì?½ë¬¸ì?? ì?¨ì?¼ ë°?ë?? ì?¬ë??ì?´ ì?½ì??ì?´ ë¬´ì??ì?? ê´?í?? ì?½ì??ì?¸ì§? ì?? ì?? "
 "ì??ì?µë??ë?¤."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
 "ì??ì??ì?? ì??ë¯¸ì??ë?? ì??ì?½ë¬¸ì?? ì?¨ì?¼ ë°?ë?? ì?¬ë??ì?´ ì??ì??ì?´ ë¬´ì??ì?? ê´?í?? ì??ì??ì?¸ì§? ì?? ì?? "
 "ì??ì?µë??ë?¤."
@@ -1960,38 +1689,34 @@ msgid "Are you sure you want to delete this task?"
 msgstr "ì ?ë§? ì?´ ì??ì??ì?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "ì ?ë§?ë¡? ì??ì?½ë¬¸ ì??ë?? ë©?ëª¨ë¥¼ ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "ì ?ë§?ë¡? ì??ì?½ë¬¸ ì??ë?? ì?½ì??ì?? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "ì ?ë§?ë¡? ì??ì?½ë¬¸ ì??ë?? ì?½ì??ì?? ë³´ë?´ì??ê² ì?µë??ê¹??"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "ì ?ë§?ë¡? ì??ì?½ë¬¸ ì??ë?? ë©?ëª¨ë¥¼ ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "ì ?ë§?ë¡? ì??ì?½ë¬¸ ì??ë?? ì??ì??ì?? ë³´ë?´ì??ê² ì?µë??ê¹??"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "ì ?ë§?ë¡? ì??ì?½ë¬¸ ì??ë?? ì??ì??ì?? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "ë?¬ë ¥ ì ?ì?¥ì??ì?? ì?°ê²°ë??ì?´ ì??ì§? ì??ì?µë??ë?¤."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "ì?? í??ì?¬ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "í??ì?¬ë¥¼ ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "'{0}' ë?¬ë ¥ì?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "'{0}' ë©?ëª¨ ëª©ë¡?ì?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "'{0}' ì??ì?? ëª©ë¡?ì?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
@@ -2037,12 +1762,7 @@ msgstr "ë©?ëª¨ ëª©ë¡?ì?? ì?½ì?´ë?¤ì?´ë??ë?° ì?¤ë¥?"
 msgid "Error loading task list"
 msgstr "ì??ì?? ëª©ë¡?ì?? ì?½ì?´ë?¤ì?´ë??ë?° ì?¤ë¥?"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "'{0}'ì?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2050,7 +1770,7 @@ msgstr ""
 "ì·¨ì?? ê³µì§?ë¥¼ ë³´ë?´ì§? ì??ì?¼ë©´, ë?¤ë¥¸ ì°¸ê°?ì??ë?¤ì?´ ì?´ ëª¨ì??ì?? ì·¨ì??í??ë?¤ë?? ì?¬ì?¤ì?? ì?? ì§? "
 "ëª»í?  ì??ë?? ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2058,7 +1778,7 @@ msgstr ""
 "ì·¨ì?? ê³µì§?ë¥¼ ë³´ë?´ì§? ì??ì?¼ë©´, ë?¤ë¥¸ ì°¸ê°?ì??ë?¤ì?´ ì?´ ë©?ëª¨ë¥¼ ì§?ì? ë?¤ë?? ì?¬ì?¤ì?? ì?? ì§? ëª»"
 "í?  ì??ë?? ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2066,11 +1786,7 @@ msgstr ""
 "ì·¨ì?? ê³µì§?ë¥¼ ë³´ë?´ì§? ì??ì?¼ë©´, ë?¤ë¥¸ ì°¸ê°?ì??ë?¤ì?´ ì?´ ì??ì??ì?? ì§?ì? ë?¤ë?? ì?¬ì?¤ì?? ì?? ì§? ëª»"
 "í?  ì??ë?? ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "ì??ë²?ì??ì?? ì??ë?µì?´ ì??ì?µë??ë?¤."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2078,7 +1794,7 @@ msgstr ""
 "ì??ë?°ì?´í?¸í?? ì ?ë³´ë¥¼ ë³´ë?´ë©´ ê·¸ê±¸ ì?´ì?©í?´ì?? ë?¤ë¥¸ ì°¸ê°?ì??ë?¤ì?´ ë?¬ë ¥ì?? ì??ë?°ì?´í?¸í?  ì?? "
 "ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2086,7 +1802,7 @@ msgstr ""
 "ì??ë?°ì?´í?¸í?? ì ?ë³´ë¥¼ ë³´ë?´ë©´ ê·¸ê±¸ ì?´ì?©í?´ì?? ë?¤ë¥¸ ì°¸ê°?ì??ë?¤ì?´ ì??ì?? ëª©ë¡?ì?? ì??ë?°ì?´í?¸"
 "í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2094,7 +1810,7 @@ msgstr ""
 "ë?¤ì?´ë¡?ë?? ì¤?ì?¸ ì²¨ë¶?ê°? ì??ì?µë??ë?¤. ì?½ì??ì?? ì§?ê¸? ì ?ì?¥í??ë©´ ë?¤ì?´ë¡?ë?? ì¤?ì?¸ ì²¨ë¶?ë¥¼ ì??ì?´"
 "ë²?ë¦¬ê²? ë?©ë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2102,95 +1818,91 @@ msgstr ""
 "ë?¤ì?´ë¡?ë?? ì¤?ì?¸ ì²¨ë¶?ê°? ì??ì?µë??ë?¤. ì??ì??ì?? ì§?ê¸? ì ?ì?¥í??ë©´ ë?¤ì?´ë¡?ë?? ì¤?ì?¸ ì²¨ë¶?ë¥¼ ì??ì?´"
 "ë²?ë¦¬ê²? ë?©ë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some features may not work properly with your current server."
 msgstr "í??ì?¬ ì??ë²?ì??ì??ë?? ì?¼ë¶? ê¸°ë?¥ì?´ ì ?ë??ë¡? ë??ì??í??ì§? ì??ì?? ì??ë?? ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "ì??ë³¼ë£¨ì?? ë?¬ë ¥ì?´ ì??ì??ì¹? ëª»í??ê²? ë??ë?¬ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "ì??ë³¼ë£¨ì?? ë?¬ë ¥ì?´ ì??ì??ì¹? ëª»í??ê²? ë??ë?¬ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "ì??ë³¼ë£¨ì?? ë©?ëª¨ê°? ì??ì??ì¹? ëª»í??ê²? ë??ë?¬ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "ì??ë³¼ë£¨ì?? ì??ì??ì?´ ì??ì??ì¹? ëª»í??ê²? ë??ë?¬ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "ì?´ ë?¬ë ¥ì?? ì?°ê²° ì¤?ì§? ì??í??ì??ì?? ì?¬ì?©í?  ì?? ì??ê²? í??ì??í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "ë©?ëª¨ ëª©ë¡?ì?´ ì?°ê²° ì¤?ì§? ì??í??ì??ì?? ì?¬ì?©í?  ì?? ì??ê²? í??ì??í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "ì??ì?? ëª©ë¡?ì?´ ì?°ê²° ì¤?ì§? ì??í??ì??ì?? ì?¬ì?©í?  ì?? ì??ê²? í??ì??í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "ì?´ ë?¬ë ¥ì?? ì??ì ?í?? ì ?ê±°í?©ë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "ì?´ ë©?ëª¨ ëª©ë¡?ì?? ì??ì ?í?? ì ?ê±°í?©ë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "ì?´ ì??ì?? ëª©ë¡?ì?? ì??ì ?í?? ì ?ê±°í?©ë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "ë?¬ë ¥ì?? ì?½ì?´ë?¤ì?¼ ì?? ì??ì?µë??ë?¤"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "ë°?ë?? ë¶?ë¶?ì?? ì?´ ì?½ì??ì?? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "ë°?ë?? ë¶?ë¶?ì?? ì?´ ëª¨ì??ì?? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "ë°?ë?? ë¶?ë¶?ì?? ì?´ ë©?ëª¨ì?? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "ë°?ë?? ë¶?ë¶?ì?? ì?´ ì??ì??ì?? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "ì?´ ë©?ëª¨ì?? ë??í?? ì·¨ì?? ê³µì§?ë¥¼ ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "ëª¨ë?  ì°¸ê°?ì??ì??ê²? ì·¨ì?? ê³µì§?ë¥¼ ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "ëª¨ì?? ì ?ë³´ë¥¼ ì°¸ê°?ì??ë?¤ì??ê²? ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "ì?´ ì??ì??ì?? ì°¸ê°?ì??ë?¤ì??ê²? ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "ì??ë?°ì?´í?¸í?? ëª¨ì?? ì ?ë³´ë¥¼ ì°¸ê°?ì??ë?¤ì??ê²? ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "ì??ë?°ì?´í?¸í?? ì??ì?? ì ?ë³´ë¥¼ ì°¸ê°?ì??ë?¤ì??ê²? ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2200,104 +1912,57 @@ msgstr ""
 "ì ?ê°? ë°?ì??í?  ì??ë?? ì??ì?µë??ë?¤. ì??ë²?ë¥¼ ì§?ì??í??ë?? ë²?ì ?ì?¼ë¡? ì??ê·¸ë ?ì?´ë??í??ë?? ê²? ê°?ì?¥ ì¢?"
 "ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ì?½ì??ì?? ë°?ë?? ì?¬í?ì?´ ì??ì§?ë§?, ì??ì§? ì ?ì?¥í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "ëª¨ì??ì?? ë°?ë?? ì?¬í?ì?´ ì??ì§?ë§?, ì??ì§? ì ?ì?¥í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "ì??ì??ì?? ë°?ë?? ì?¬í?ì?´ ì??ì§?ë§?, ì??ì§? ì ?ì?¥í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "ë©?ëª¨ì?? ë°?ë?? ì?¬í?ì?´ ì??ì§?ë§?, ì??ì§? ì ?ì?¥í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "ì??ë³¼ë£¨ì??ì?? ë?¤ì?? ì??ì??í?  ë??ê¹?ì§?ë?? ë?¬ë ¥ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "ì??ë³¼ë£¨ì??ì?? ë?¤ì?? ì??ì??í?  ë??ê¹?ì§?ë?? ë©?ëª¨ë¥¼ ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "ì??ë³¼ë£¨ì??ì?? ë?¤ì?? ì??ì??í?  ë??ê¹?ì§?ë?? ì??ì??ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "ë°?ë?? ë?´ì?© ë²?ë¦¬ê¸°(_D)"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "ì ?ì?¥(_S)"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "ë°?ë?? ë?´ì?© ì ?ì?¥(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "ë³´ë?´ê¸°(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "ê³µì§?ì?¬í? ë³´ë?´ê¸°(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
-# event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "ì?¬ë?¬ ë? ì?? ê±¸ì¹? í??ì?¬ ë¶?ë¦¬:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "evolution-data-serverë¥¼ ì??ì??í?  ì?? ì??ì?µë??ë?¤"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "í??ì?¼ë¡¯ì?? Calendar í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "í??ì?¼ë¡¯ì?? Memo í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "í??ì?¼ë¡¯ì?? Memo í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?¸ ì?? ì??ì?µë??ë?¤"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "ê¸°ë³¸ ì?°ì? ì??ì??:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "í??ì?¼ë¡¯ì?? ToDo í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "í??ì?¼ë¡¯ì?? ToDo í??ë¡?ê·¸ë?¨ ë¸?ë¡?ì?? ì?¸ ì?? ì??ì?µë??ë?¤"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
@@ -2308,7 +1973,7 @@ msgid "hour"
 msgid_plural "hours"
 msgstr[0] "ì??ê°?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "ì??ì?? ì??ê°?"
 
@@ -2323,10 +1988,10 @@ msgstr "ëª¨ë?? í?´ì ?(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "ì??ì¹?:"
 
@@ -2339,66 +2004,57 @@ msgid "_Dismiss"
 msgstr "í?´ì ?(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "í?¸ì§?(_E)"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "ì?°ê¸° ëª¨ë??(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "ì??ê°?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "ì?½ì?? ì?¥ì??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "ë¶?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
 msgid "No summary available."
 msgstr "ì??ì?½ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "ì?¤ëª?ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "ì??ì¹? ì ?ë³´ê°? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
 msgid "You have %d alarms"
 msgstr "%dê°? ì??ë¦¼ì?´ ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "ê²½ê³ "
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2411,7 +2067,7 @@ msgstr ""
 "ë³´ë?´ë?? ë??ì?  ì?¼ë°?ì ?ì?¸ ë¯¸ë¦¬ ì??ë¦¼ ë??í?? ì??ì??ë¥¼ í??ì??í?©ë??ë?¤."
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2428,7 +2084,7 @@ msgstr ""
 "\n"
 "ì ?ë§?ë¡? ì?´ í??ë¡?ê·¸ë?¨ì?? ì?¤í??í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 msgid "Do not ask me about this program again."
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ ë?¤ì?? ë³´ì§? ì??ì?µë??ë?¤."
 
@@ -2467,7 +2123,7 @@ msgid "Alarm programs"
 msgstr "ì??ë¦¼ í??ë¡?ê·¸ë?¨"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ì?¤ë¥?ë¥¼ ì??í?? í??ì??ì¤?ì?? í??ì??í?  ì??ê°?, ì´? ë?¨ì??."
 
@@ -2488,200 +2144,196 @@ msgid "Calendars to run alarms for"
 msgstr "ì??ë¦¼ì?? ì?¤í??í?  ë?¬ë ¥"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "ì°¸ì?´ë©´ ì??ë³¼ë£¨ì??ì??ì?? ì??ì?¤í?? í??ì¤? ì??ê°?ë??ë¥¼ ì?¬ì?©í?©ë??ë?¤."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "ì??ê°? ë§?ë??ì?? ë§?ì»¤ì?¤ ë² ì?¸ì?¤ ë?¼ì?¸ì?? ê·¸ë¦´ ì?? (ê¸°ë³¸ê°?ì?? ë¹?ì?´ ì??ì??)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "í??ë£¨ì?© ë³¼ ë?? ë§?ì»¤ì?¤ ë² ì?¸ì?¤ ë?¼ì?¸ì?? ê·¸ë¦´ ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "í?? ë?¬ì?© ë³¼ ë?? í? ì??ì?¼/ì?¼ì??ì?¼ì?? í?? ì¹¸ì?? í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "í?´ë?? ë¹?ì?¸ ë?? í??ì?¸ ì§?ë¬¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr "ì?? í??ì?¬ì?? ê¸°ë³¸ ë°?ë³µ í??ì??. -1ì?? ê³?ì?? ë°?ë³µí??ë?¤ë?? ë?»ì??ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "ê·¼ë¬´ ì??ì??/ë?? ì??ê°?ì?? ì§?ì ?í?  ë? ."
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "ê¸°ë³¸ ì?½ì?? ë¯¸ë¦¬ ì??ë¦¼"
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "ê¸°ë³¸ ë°?ë³µ í??ì??"
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "ê¸°ë³¸ ë¯¸ë¦¬ ì??ë¦¼ ë?¨ì??"
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "ê¸°ë³¸ ë¯¸ë¦¬ ì??ë¦¼ ê°?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "ì??ë¦¼ ì?¤ë??ì?¤ í??ì?¼ì?? ì ?ì?¥í?  ë??ë ?í?°ë¦¬"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "í??ì?¬ ê·¸ë?¼ë??ì?¸í?¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "í??ì?¬ í?¬ëª?ë??"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì??ë²? URL"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì??ì?? URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "ë?¬ë ¥ ë³´ê¸°ì??ì?? í??ì?¬ì?? ê·¸ë?¼ë??ì?¸í?¸."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "ë??ë§?ì¹? ì??ì?? ì?¨ê¸°ê¸°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "ì??ì?? ë?¨ì?? ì?¨ê¸°ê¸°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "ì??ì?? ê°? ì?¨ê¸°ê¸°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "ê°?ë¡? ì°½ ì??ì¹?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "ê·¼ë¬´ì?¼ì?? ë??ë??ë?? ì??ê°?, 24ì??ê°? í??ì??ì?¼ë¡? 0ì??ì?? 23ê¹?ì§?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "ê·¼ë¬´ì?¼ì?? ì??ì??í??ë?? ì??ê°?, 24ì??ê°? í??ì??ì?¼ë¡? 0ì??ì?? 23ê¹?ì§?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "ì°¸ì?´ë©´ ë©?ì?¸ ì°½ì?? ë©?ëª¨ ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? í??ì??í?©ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "ì°¸ì?´ë©´ ë©?ì?¸ ì°½ì?? ì??ì?? ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? í??ì??í?©ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "ì?¼ë³? ë³´ê¸° ë°? ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°ì?? ë³´ì?¼ ì??ê°? ê°?ê²©, ë¶? ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "ë§?ì§?ë§? ì??ë¦¼ ì??ê°?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Level beyond which the message should be logged."
 msgstr "ì?´ë?¤ ë©?ì??ì§?ë¥¼ ê¸°ë¡?í? ì§? ë?¨ê³?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "ì?¼ë³? ë³´ê¸°ì??ì?? ìµ?ê·¼ì?? ì?¬ì?©í?? ë³´ì¡° í??ì¤? ì??ê°?ë??ì?? ëª©ë¡?."
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ë¥¼ ê²?ì??í?  ì??ë²? URL ëª©ë¡?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "ë§?ì»¤ì?¤ ë² ì?¸ ë?¼ì?¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "ë§?ì»¤ì?¤ ë² ì?¸ ë?¼ì?¸ ì?? - ë? ì§?ë³? ë³´ê¸°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "ë§?ì»¤ì?¤ ë² ì?¸ ë?¼ì?¸ ì?? - ì??ê°? ë§?ë??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr ""
 "'day_second_zones' ëª©ë¡?ì??ì?? ì ?ì?¥í?  ìµ?ê·¼ì?? ì?¬ì?©í?? í??ì¤? ì??ê°?ë??ì?? ìµ?ë?? ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "ìµ?ê·¼ì?? ì?¬ì?©í?? í??ì¤? ì??ê°?ë??ë¥¼ ì ?ì?¥í?  ìµ?ë?? ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "ë©?ëª¨ í??ë©´ ë°°ì¹?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "ë©?ëª¨ ë¯¸ë¦¬ ë³´ê¸° ì°½ ì??ì¹? (ê°?ë¡?)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "ë©?ëª¨ ë¯¸ë¦¬ ë³´ê¸° ì°½ ì??ì¹? (ì?¸ë¡?)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "ê·¼ë¬´ì?¼ì?? ë??ë??ë?? ë¶?, 0ì??ì?? 59ê¹?ì§?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "ê·¼ë¬´ì?¼ì?? ì??ì??í??ë?? ë¶?, 0ì??ì?? 59ê¹?ì§?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "í?? ë?¬ì?© ë³´ê¸° ê°?ë¡? ì°½ ì??ì¹?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "í?? ë?¬ì?© ë³´ê¸° ì?¸ë¡? ì°½ ì??ì¹?"
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "ê¸°ë³¸ ë¯¸ë¦¬ ì??ë¦¼ ì?¬ë¶?ë¥¼ ê²°ì ?í?  ë?¨ì??ì?? ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "ì?¸ì ? ì??ì??ì?? ê°?ì¶? ì§? ê²°ì ?í?  ë?¨ì??ì?? ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "ë§?ê°?ì?´ ì§?ë?? ì??ì?? ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -2689,7 +2341,7 @@ msgstr ""
 "ê°?ë¡? ì°½ì?? ì??ì¹?, í?? ë?¬ì?© ë³´ê¸°ê°? ì??ë?? ë?? ë? ì§? ì? í?? ë?¬ë ¥ê³¼ ì??ì?? ëª©ë¡? ì?¬ì?´, í?½ì?? "
 "ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2697,25 +2349,25 @@ msgstr ""
 "ê°?ë¡? ì°½ì?? ì??ì¹?, í?? ë?¬ì?© ë³´ê¸°ì??ì?? ë·°ì?? ë? ì§? ì? í?? ë?¬ë ¥ê³¼ ì??ì?? ëª©ë¡? ì?¬ì?´, í?½ì?? "
 "ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "ì?¸ë¡? ë°©í?¥ì?¼ ë?? ë©?ëª¨ ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì??ì¹?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "ê°?ë¡? ë°©í?¥ì?¼ ë?? ì??ì?? ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì??ì¹?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "ì?¸ë¡? ë°©í?¥ì?¼ ë?? ì??ì?? ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì??ì¹?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "ì?¸ë¡? ì°½ì?? ì??ì¹?, ì¹´ë?? ëª©ë¡?ê³¼ ë? ì§? ì°¾ì??ë³´ê¸° ë?¬ë ¥ ì?¬ì?´."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2723,7 +2375,7 @@ msgstr ""
 "ì?¸ë¡? ì°½ì?? ì??ì¹?, í?? ë?¬ì?© ë³´ê¸°ì??ì?? ë·°ì?? ë? ì§? ì? í?? ë?¬ë ¥ê³¼ ì??ì?? ëª©ë¡? ì?¬ì?´, í?½ì?? "
 "ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 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."
@@ -2731,83 +2383,80 @@ msgstr ""
 "ì?¸ë¡? ì°½ì?? ì??ì¹?, í?? ë?¬ì?© ë³´ê¸°ê°? ì??ë?? ë?? ë·°ì?? ë? ì§? ì? í?? ë?¬ë ¥ê³¼ ì??ì?? ëª©ë¡? ì?¬ì?´, "
 "í?½ì?? ë?¨ì??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "ì£¼ì?? ë?¬ë ¥"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "ì£¼ì?? ë©?ëª¨ ëª©ë¡?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "ì£¼ì?? ì??ì?? ëª©ë¡?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "ì??ë¦¼ì??ì?? ì?¤í??í?  í??ë¡?ê·¸ë?¨."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "ì?¼ë³? ë³´ê¸°ì??ì?? ìµ?ê·¼ì?? ì?¬ì?©í?? ë³´ì¡° í??ì¤? ì??ê°?ë??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "ì??ë?? ì?¤ë??ì?¤ ì ?ì?¥ ë??ë ?í?°ë¦¬"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "í?? ì£¼ ë?¨ì??ë¡? ë?¬ë³? ë³´ê¸°ë¥¼ ì?¤í?¬ë¡¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì??ë?µì??ì² í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì?í?  í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "í?? ì£¼ì?© ë³´ê±°ë?? í?? ë?¬ì?© ë³¼ ë?? ì?½ì?? ë??ë??ë?? ì??ê°? í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ë¶?ë¥? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "ì??ë¦¼ ì??ì?ì??ì?? ì??ë¦¼ í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì??í?? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "ë©?ëª¨ ë¯¸ë¦¬ ë³´ê¸° ì°½ í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "ì??ì?? ë¯¸ë¦¬ ë³´ê¸° ì°½ í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "í??ì?¬/ëª¨ì?? í?¸ì§?ì??ì?? í??ì¤? ì??ê°?ë?? í?ëª©ì?? í??ì??í?©ë??ë?¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì¢?ë¥? í?ëª©ì?? í??ì??í?©ë??ë?¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week number in Day and Work Week View"
-msgstr "ì?¼ë³? ë³´ê¸° ë°? ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°ì??ì?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??í?©ë??ë?¤"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Show week numbers in date navigator"
-msgstr "ë? ì§? ì? í??í?  ë?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??í?©ë??ë?¤"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
+"ì?¼ë³? ë³´ê¸°, ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°, ë? ì§? ì? í?? ë?¬ë ¥ì??ì?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??í?©ë??ë?¤"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2815,24 +2464,24 @@ msgstr ""
 "ë³´ì¡° í??ì¤? ì??ê°?ë??ê°? ì??ì?¼ë©´, ì?¼ë³? ë³´ê¸°ì??ì?? ë³´ì¡° í??ì¤? ì??ê°?ë??ë¥¼ í??ì??í?©ë??ë?¤. ê°?ì?? "
 "'timezone' í?¤ì??ì?? ì?¬ì?©í?? ê°?ê³¼ ë¹?ì?·í?©ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "ì??ì?? í??ë©´ ë°°ì¹?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "ì??ì?? ë¯¸ë¦¬ ë³´ê¸° ì°½ ì??ì¹? (ê°?ë¡?)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "ì??ì?? ë¯¸ë¦¬ ë³´ê¸° ì°½ ì??ì¹? (ì?¸ë¡?)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "ì?¤ë?? ë§?ê°?ì?¸ ì??ì??ì?? ì??"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2841,7 +2490,7 @@ msgstr ""
 "ì?½ì?? ì??ì??/ì??ì?? ë?°ì?´í?° ë??ì²´í??ì?¼ë¡? ì?¬ì?©í?  URL ì??ì??, %uì??(ë??) ì ?ì??ë©?ì?¼ ì£¼ì??ì?? ì?¬"
 "ì?©ì?? ë¶?ë¶?, %dì??(ë??) ë??ë©?ì?¸ì?¼ë¡? ë°?ë??ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2849,197 +2498,193 @@ msgstr ""
 "ë?¬ë ¥ì?? ë? ì§?ì?? ì??ê°?ì?? ì?¬ì?©í?  ê¸°ë³¸ í??ì¤? ì??ê°?ë??, Olsen í??ì¤? ì??ê°?ë?? ë?°ì?´í?°ë² ì?´ì?¤"
 "ì?? ë?°ë?¼ì??. (ë²?ì?í??ì§? ì??ê³  \"America/New York\"ì?? ê°?ì?´ ì??ë??ë?¤.)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
-"ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë©?ëª¨ ëª©ë¡? ì??ì¹?ì?? ë¹?êµ?í?´ì?? ì?´ë??ì?? ë?? ì§? ê²°ì ?í??ë?? ë°°ì¹? ë°©ì??. \"0"
-"\"ì?? (ì ?í?µì ? ë°©ì??) ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë©?ëª¨ ëª©ë¡? ì??ë??ì?? ë?¡ë??ë?¤. \"1\"ì?? (ì?¸ë¡? ë³´"
-"ê¸°) ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë©?ëª¨ ëª©ë¡? ì??ì?? ë??ë??í?? ë?¡ë??ë?¤."
+"ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë©?ëª¨ ëª©ë¡? ì??ì¹?ì?? ë¹?êµ?í?´ì?? ì?´ë??ì?? ë?? ì§? ê²°ì ?í??ë?? ë°°ì¹? ë°©ì??. "
+"\"0\"ì?? (ì ?í?µì ? ë°©ì??) ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë©?ëª¨ ëª©ë¡? ì??ë??ì?? ë?¡ë??ë?¤. \"1\"ì?? (ì?¸ë¡? "
+"ë³´ê¸°) ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë©?ëª¨ ëª©ë¡? ì??ì?? ë??ë??í?? ë?¡ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
-"ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì??ì?? ëª©ë¡? ì??ì¹?ì?? ë¹?êµ?í?´ì?? ì?´ë??ì?? ë?? ì§? ê²°ì ?í??ë?? ë°°ì¹? ë°©ì??. \"0"
-"\"ì?? (ì ?í?µì ? ë°©ì??) ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì??ì?? ëª©ë¡? ì??ë??ì?? ë?¡ë??ë?¤. \"1\"ì?? (ì?¸ë¡? ë³´"
-"ê¸°) ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì??ì?? ëª©ë¡? ì??ì?? ë??ë??í?? ë?¡ë??ë?¤."
+"ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì??ì?? ëª©ë¡? ì??ì¹?ì?? ë¹?êµ?í?´ì?? ì?´ë??ì?? ë?? ì§? ê²°ì ?í??ë?? ë°°ì¹? ë°©ì??. "
+"\"0\"ì?? (ì ?í?µì ? ë°©ì??) ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì??ì?? ëª©ë¡? ì??ë??ì?? ë?¡ë??ë?¤. \"1\"ì?? (ì?¸ë¡? "
+"ë³´ê¸°) ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì??ì?? ëª©ë¡? ì??ì?? ë??ë??í?? ë?¡ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
 msgstr "ì?¼ë³? ë³´ê¸°ì??ì?? ë³´ì¡° í??ì¤? ì??ê°?ë??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
 "ì?¸ ê°?ì§? ê°?ì?´ ê°?ë?¥í?©ë??ë?¤. \"0\"ì?? ì?¤ë¥?, \"1\"ì?? ê²½ê³ , \"2\"ë?? ë??ë²?ê¹? ë©?ì??ì§?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "ì??ê°? ê°?ê²©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "ìµ?ê·¼ì?? ì??ë¦¼ì?´ ì??ë??í?? ì??ê°?, time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "í??ì¤? ì??ê°?ë?? "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "ë?¬ë ¥ ë³´ê¸°ì??ì?? í??ì?¬ì?? í?¬ëª?ë??, 0(í?¬ëª?)ì??ì?? 1(ë¶?í?¬ëª?) ì?¬ì?´ì?? ê°?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "24ì??ê°? í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "ì? í??í?? (\"ì£¼ì??\") ë?¬ë ¥ì?? URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "ì? í??í?? (\"ì£¼ì??\") ë©?ëª¨ ëª©ë¡?ì?? URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "ì? í??í?? (\"ì£¼ì??\") ì??ì?? ëª©ë¡?ì?? URI"
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "ê¸°ë³¸ ë¯¸ë¦¬ ì??ë¦¼ì?? ë?¨ì??, \"minutes\", \"hours\" í?¹ì?? \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "ì??ì??ì?? ì?¸ì ? ì?¨ê¸¸ì§? ê²°ì ?í??ë?? ë?¨ì??, \"minutes\", \"hours\" í?¹ì?? \"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "ì??ì?¤í?? í??ì¤? ì??ê°?ë?? ì?¬ì?©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "ì??ë³¼ë£¨ì??ì??ì?? ì? í??í?? í??ì¤? ì??ê°?ë??ê°? ì??ë??ë?¼ ì??ì?¤í?? í??ì¤? ì??ê°?ë??ë¥¼ ì?¬ì?©í?©ë??ë?¤."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "ì?¸ë¡? ì°½ ì??ì¹?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "ì??ì?? ì??ì?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "í?? ì£¼ê°? ì??ì??í??ë?? ì??ì?¼, ì?¼ì??ì?¼(0)ì??ì?? í? ì??ì?¼(6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "ì??ë¦¼ì?? í??ì??í?  ë?? ì??ë¦¼ ì??ì?ì?? ì?¬ì?©í? ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ì?½ì??ì?´ë?? ì??ì??ì?? ì§?ì?¸ ë?? í??ì?¸ ì§?ë¬¸ì?? í? ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ì§?ì?´ ì?½ì??ì?´ë?? ì??ì??ì?? ë¹?ì?¸ ë?? í??ì?¸ ì§?ë¬¸ì?? í? ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "í?? ë?¬ì?© ë³¼ ë?? ì£¼ë§?ì?? ì??ì?½í?´ì?? í? ì??ì?¼/ì?¼ì??ì?¼ì?? í?? ì¹¸ì?? í??ì??í? ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "í?? ì£¼ì?© ë³´ê±°ë?? í?? ë?¬ì?© ë³¼ ë?? í??ì?¬ ë??ë??ë?? ì??ê°? í??ì??í? ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "ë?¬ë ¥ì?? ë§?ì»¤ì?¤ ë² ì?¸ì?¤ ë?¼ì?¸ì?? (í?´ë?¹ í??ì¤? ì??ê°?ë??ì?? ì§?ì? ) ê·¸ë¦´ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "ë??ë§?ì¹? ì??ì??ì?? ì??ì?? í??ì??í?  ë?? ê°?ì¶?ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "í?? ë?¬ ë?¨ì??ê°? ì??ë??ë?¼ í?? ì£¼ ë?¨ì??ë¡? ë?¬ë³? ë³´ê¸°ë¥¼ ì?¤í?¬ë¡¤í? ì§? ì?¬ë¶?."
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "ì?½ì??ì?? ë¯¸ë¦¬ ì??ë¦¼ ê¸°ë³¸ê°?ì?? ì?¤ì ?í? ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì??ë?µì??ì² í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "í??ì?¬/ëª¨ì?? í?¸ì§?ì??ì?? ë¶?ë¥? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì?í?  í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì??í?? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "ì??ê°?ì?? ì?¤ì ?/ì?¤í??ê°? ì??ë?? 24ì??ê°? ëª¨ë??ë¡? í??ì??í? ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "í??ì?¬/ëª¨ì?? í?¸ì§?ì??ì?? í??ì¤? ì??ê°?ë?? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "í??ì?¬/ì??ì??/ëª¨ì?? í?¸ì§?ì??ì?? ì¢?ë¥? í?ëª© í??ì??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "ì?¼ë³? ë³´ê¸° ë°? ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°ì??ì?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??í? ì§? ì?¬ë¶?."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Whether to show week numbers in the date navigator."
-msgstr "ë? ì§? ì? í??í?  ë?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??í? ì§? ì?¬ë¶?."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "ë?¬ë ¥ì?? ì?¬ë?¬ê°?ì§? ë¶?ë¶?ì??ì?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??í? ì§? ì?¬ë¶?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "ê·¼ë¬´ ì??ì?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "ê·¼ë¬´ì?¼ì?? ë??ë??ë?? ì??ê°?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "ê·¼ë¬´ì?¼ì?? ë??ë??ë?? ë¶?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "ê·¼ë¬´ì?¼ì?? ì??ì??í??ë?? ì??ê°?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "ê·¼ë¬´ì?¼ì?? ì??ì??í??ë?? ë¶?"
 
@@ -3090,17 +2735,17 @@ msgstr "ë?±ê¸?"
 
 # ë¹?ë°? ì?µì??
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "ë¹?ë°?"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "ì?¤ëª?"
@@ -3121,7 +2766,7 @@ msgid "Exist"
 msgstr "ì¡´ì?¬í?¨"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3134,25 +2779,26 @@ msgid "Organizer"
 msgstr "ì£¼ìµ?ì??"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ê°?ì?¸"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ê³µê°?"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "ë°?ë³µ"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
@@ -3219,6 +2865,7 @@ msgstr "ì??ë¦¼ ì¶?ê°?"
 
 # Alarm -> ì??ë¦¼, Microsoft Office XP ì°¸ê³ 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "ì??ë¦¼"
 
@@ -3234,7 +2881,7 @@ msgstr "ì?¬ì?©ì?? ì?¤ì ? ì??ë¦¼ ì??ë¦¬"
 msgid "Mes_sage:"
 msgstr "ë©?ì??ì§?(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
 msgid "Options"
 msgstr "ì?µì??"
 
@@ -3277,18 +2924,16 @@ msgid "before"
 msgstr "ë?¤ì?? ì??ì??:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
 msgid "day(s)"
 msgstr "ì?¼"
 
 # FIXME - hard to translate UI + string based on English grammar
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
 msgid "days"
 msgstr "ì?¼"
 
@@ -3296,19 +2941,20 @@ msgstr "ì?¼"
 msgid "end of appointment"
 msgstr "ì?½ì?? ë??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "ë²?, ì£¼ê¸°:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "ì??ê°?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "ë¶?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "ì?½ì?? ì??ì??"
 
@@ -3324,35 +2970,36 @@ msgstr "ì¶?ê°?(_D)"
 # Alarm -> ì??ë¦¼, Microsoft Office XP ì°¸ê³ 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "Alarms"
 msgstr "ì??ë¦¼"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "ì? í??..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "ì??ë¦¼ì?? ì? í??í?? ë?¬ë ¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "ë? ì§? ë°? ì??ê°?:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+msgid "Ti_me and date:"
+msgstr "ë? ì§? ë°? ì??ê°?(_M):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "ë? ì§?ë§?:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "_Date only:"
+msgstr "ë? ì§?ë§?(_D):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3384,13 +3031,13 @@ msgid "60 minutes"
 msgstr "60ë¶?"
 
 # "Prompt when sending .." ë?°ì?? í??ì?¸ ì§?ë¬¸ ì?¤ì ? ì ?ëª©
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "í??ì?¸"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
-#: ../modules/addressbook/autocompletion-config.c:153
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "ë? ì§?/ì??ê°? í??ì??"
 
@@ -3416,20 +3063,20 @@ msgid "Display alarms in _notification area only"
 msgstr "ì??ë¦¼ ì??ì?ì??ì??ë§? ì??ë¦¼ í??ì??(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "ê¸?ì??ì?¼"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2678
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "ì?¼ë°?"
 
@@ -3444,30 +3091,23 @@ msgid "Minutes"
 msgstr "ë¶?"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "ì??ì??ì?¼"
 
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "ì??ì??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "ì??ì?? ê³ ë¥´ì?ì??ì?¤"
 
+#. Sunday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "ì?¼(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "í? ì??ì?¼"
@@ -3486,160 +3126,167 @@ msgstr "ì??ë¦¼ì?? ì§?ì ?í?  ë?¬ë ¥ì?? ì? í??í??ì?ì??ì?¤"
 
 # "Sh_ow a reminder NN minute(s)/hour(s)/day(s) before every appointment"
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Sh_ow a reminder"
-msgstr "ì?½ì??(_O)"
+msgstr "ë¯¸ë¦¬ ì??ë¦¼ í??ì??(_O)"
 
 # "Sh_ow a reminder NN minute(s)/hour(s)/day(s) before every appointment"
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show a _reminder"
 msgstr "ë¯¸ë¦¬ ì??ë¦¼ í??ì??(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week _numbers in date navigator"
-msgstr "ë? ì§? ì? í??í?  ë?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "ì?¼ë³? ë³´ê¸° ë°? ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°ì??ì?? ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??(_U)"
-
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+msgid "Show week _numbers"
+msgstr "ëª? ë²?ì§¸ ì£¼ì?¸ì§? í??ì??(_N)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "ì?¼ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_asks due today:"
 msgstr "ì?¤ë?? ë§?ê°?ì?¸ ì??ì??(_A):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_hu"
 msgstr "ëª©(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "ì??ì?? ëª©ë¡?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "Template:"
 msgstr "ì??ì??:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "ëª©ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:595
 msgid "Time"
 msgstr "ì??ê°?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Time _zone:"
 msgstr "í??ì¤? ì??ê°?ë??(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Time format:"
 msgstr "ì??ê°? í??ì??:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "í??ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Use s_ystem time zone"
 msgstr "ì??ì?¤í?? í??ì¤? ì??ê°?ë?? ì?¬ì?©(_Y)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "ì??ì??ì?¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "Wee_k starts on:"
 msgstr "ì??ì?? ì??ì?¼(_K):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "ê·¼ë¬´ ì£¼"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Work days:"
 msgstr "ê·¼ë¬´ ì??ì?¼:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12ì??ê°? (ì?¤ì ?/ì?¤í??)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_24 hour"
 msgstr "_24ì??ê°?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "í?ëª©ì?? ì§?ì?¸ ë?? í??ì?¸ ì§?ë¬¸í??ê¸°(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Compress weekends in month view"
 msgstr "í?? ë?¬ì?© ë³¼ ë?? ì£¼ë§?ì?? í?? ì¹¸ì?? í??ì??(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Day begins:"
 msgstr "í??ë£¨ì?? ì??ì??(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Fri"
 msgstr "ê¸?(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Hide completed tasks after"
 msgstr "ë??ë§?ì¹? ì??ì??ì?´ ë?¤ì?? ì??ê°?ì?´ ì§?ë??ë©´ ì?¨ê¸°ê¸°(_H):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Mon"
 msgstr "ì??(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Overdue tasks:"
 msgstr "ë§?ê°?ì?´ ì§?ë?? ì??ì??(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Sat"
 msgstr "í? (_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Show appointment end times in week and month view"
 msgstr "í?? ì£¼ì?© ë³´ê±°ë?? í?? ë?¬ì?© ë³¼ ë?? ì?½ì?? ë??ë??ë?? ì??ê°? í??ì??(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Time divisions:"
 msgstr "ì??ê°? ê°?ê²©(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Tue"
 msgstr "í??(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Wed"
 msgstr "ì??(_W)"
 
 # FIXME: bad msgid
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr ", ë§¤ ê¸°ë??ì?¼/ì??ì?¼ ì ?ì??"
 
 # FIXME: bad msgid
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every appointment"
 msgstr ", ë§¤ ì?½ì?? ì ?ì??"
 
@@ -3648,15 +3295,15 @@ msgid "Type:"
 msgstr "í??í??:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "ì¢?ë¥?(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:282
+#: ../widgets/misc/e-signature-script-dialog.c:286
 msgid "_Name:"
 msgstr "ì?´ë¦?(_N):"
 
@@ -3672,35 +3319,35 @@ msgstr "ì?°ê²° ì¤?ì§? ì??í?? ì??ì??ì?? ì??í?´ ì??ì?? ëª©ë¡? ë?´ì?©ì?? ë¡?ì»¬ì??
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ì?°ê²° ì¤?ì§? ì??í?? ì??ì??ì?? ì??í?´ ë©?ëª¨ ëª©ë¡? ë?´ì?©ì?? ë¡?ì»¬ì?? ë³µì?¬(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "ì??(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "ë©?ëª¨ ëª©ë¡?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "ë?¬ë ¥ ì??ì?±"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "ì?? ë?¬ë ¥"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "ì??ì?? ëª©ë¡? ì??ì?±"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "ì?? ì??ì?? ëª©ë¡?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "ë©?ëª¨ ëª©ë¡? ì??ì?±"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "ì?? ë©?ëª¨ ëª©ë¡?"
 
@@ -3758,273 +3405,253 @@ msgstr "%s  ë°?ë?? ì?¬í?ì?´ ì??ì?µë??ë?¤. í?¸ì§?ê¸°ë¥¼ ì??ë?°ì?´í?¸í??ì??ê² ì?µ
 msgid "Validation error: %s"
 msgstr "ì? í?¨ì?± ê²?ì?¬ ì?¤ë¥?: %s"
 
-# FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr "ë¶?í?° "
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (ì??ë£?ë?¨ "
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "ì??ë£?ë?¨ "
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (ê¸°í?? "
-
-# FIXME - hard to translate UI + string based on English grammar
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "ê¸°í?? "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "ì²¨ë¶?ë¥¼ ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:522
 msgid "Could not update object"
 msgstr "ì?¤ë¸?ì ?í?¸ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "Edit Appointment"
 msgstr "ì?½ì?? í?¸ì§?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
 msgstr "ëª¨ì?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
 msgstr "ì?½ì?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "í? ë?¹í?? ì??ì?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
 msgstr "ì??ì?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
 msgstr "ë©?ëª¨ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
 msgstr "ì??ì?½ ì??ì??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "Keep original item?"
 msgstr "ë³¸ë?? í?ëª©ì?? ì? ì§?í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:983
 msgid "Click here to close the current window"
 msgstr "í??ì?¬ ì°½ì?? ë?«ì?¼ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1454
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
 msgid "Copy the selection"
 msgstr "ì? í??í?? ì?¬í?ì?? ë³µì?¬í?©ë??ë?¤"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1461
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1060
 msgid "Cut the selection"
 msgstr "ì? í??í?? ì?¬í?ì?? ì??ë?¼ë??ë??ë?¤"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1468
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "ì? í??í?? ì?¬í?ì?? ì?ì ?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
 msgstr "í?´ë?¹ ë??ì??ë§?ì?? ë³´ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
 # tooltip
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1503
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1072
 msgid "Paste the clipboard"
 msgstr "í?´ë¦½ë³´ë??ì??ì?? ë¶?ì?¬ ë?£ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
 msgstr "í??ì?¬ ì°½ì?? ì ?ì?¥í??ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1573
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "ëª¨ë?  í??ì?¤í?¸ ì? í??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "ë¶?ë¥?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:152
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1608
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "í?¸ì§?(_E)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1615
+#: ../widgets/misc/e-signature-editor.c:220
 msgid "_File"
 msgstr "í??ì?¼(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "ë??ì??ë§?(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "_Insert"
 msgstr "ë?£ê¸°(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "ì?µì??(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "ë³´ê¸°(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "ì²¨ë¶?(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
 msgstr "í??ì?¼ì?? ì²¨ë¶?í??ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
 msgstr "ë¶?ë¥?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
 msgstr "ë¶?ë¥?ë¥¼ í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
 msgstr "í??ì¤? ì??ê°?ë??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the time zone is displayed"
 msgstr "í??ì¤? ì??ê°?ë?? í?ëª©ì?? í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "Pu_blic"
 msgstr "ê³µê°?(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
 msgstr "ê³µê°?ë¡? ë¶?ë¥?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
 msgstr "ê°?ì?¸ ì ?ë³´(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
 msgstr "ê°?ì?¸ ì ?ë³´ë¡? ë¶?ë¥?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
 msgstr "ë¹?ë°?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
 msgstr "ë¹?ë°?ë¡? ë¶?ë¥?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
 msgstr "ì?í?  í?ëª©(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "Toggles whether the Role field is displayed"
 msgstr "ì?í?  í?ëª©ì?? í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "_RSVP"
 msgstr "ì??ë?µë°?ë??(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ì??ë?µì??ì² í?ëª©ì?? í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1174
 msgid "_Status Field"
 msgstr "ì??í?? í?ëª©(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Toggles whether the Status field is displayed"
 msgstr "ì??í?? í?ëª©ì?? í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "_Type Field"
 msgstr "ì¢?ë¥? í?ëª©(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "ì°¸ì??ì?? ì¢?ë¥?ë¥¼ í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1208
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "ìµ?ê·¼ ë¬¸ì??(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "ì²¨ë¶?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
-msgid "Save"
-msgstr "ì ?ì?¥"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ì??ë?°ì?´í?¸ê°? ë??ì°©í??ë©´ ì?´ í?ëª©ì?? ë??í?´ ë°?ë?? ì?¬í?ì?? ë²?ë¦½ë??ë?¤."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "ì²¨ë¶?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:3118
 msgid "Unable to use current version!"
 msgstr "í??ì?¬ ë²?ì ?ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "ì??ì?¤ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "ë°?ì?? ê³³ì?? ì?´ ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "ë°?ì?? ê³³ì?´ ì?½ê¸° ì ?ì?©ì??ë??ë?¤"
 
@@ -4032,56 +3659,76 @@ msgstr "ë°?ì?? ê³³ì?´ ì?½ê¸° ì ?ì?©ì??ë??ë?¤"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "ì?´ í?ëª©ì?? ë?¤ë¥¸ ì??ì? ì??ì?? ë©?ì?¼í?¨ì??ì??ë?? ì§?ì??(_D)"
 
-# event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "CORBA ì?¤ë¥?ë??ë¬¸ì?? ì?´ í??ì?¬ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "ë©?ëª¨ ì² í??(_R):"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "CORBA ì?¤ë¥?ë??ë¬¸ì?? ì?´ ì??ì??ì?? ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+# event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "dbus ì?¤ë¥? ë??ë¬¸ì?? ì?´ í??ì?¬ë¥¼ ì?ì ?í?  ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "CORBA ì?¤ë¥?ë??ë¬¸ì?? ì?´ ë©?ëª¨ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "dbus ì?¤ë¥? ë??ë¬¸ì?? ì?´ ì??ì??ì?? ì?ì ?í?  ì?? ì??ì?µë??ë?¤: %s"
 
+#. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "CORBA ì?¤ë¥?ë??ë¬¸ì?? ì?´ í?ëª©ì?? ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "dbus ì?¤ë¥? ë??ë¬¸ì?? ì?´ ë©?ëª¨ë¥¼ ì?ì ?í?  ì?? ì??ì?µë??ë?¤: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "dbus ì?¤ë¥? ë??ë¬¸ì?? ì?´ í?ëª©ì?? ì?ì ?í?  ì?? ì??ì?µë??ë?¤: %s"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
-msgstr "ê¶?í??ì?´ ê±°ë¶?ë??ì?´ ì?´ í??ì?¬ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+msgstr "ê¶?í??ì?´ ê±°ë¶?ë??ì?´ ì?´ í??ì?¬ë¥¼ ì?ì ?í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
-msgstr "ê¶?í??ì?´ ê±°ë¶?ë??ì?´ ì?´ ì??ì??ì?? ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+msgstr "ê¶?í??ì?´ ê±°ë¶?ë??ì?´ ì?´ ì??ì??ì?? ì?ì ?í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
-msgstr "ê¶?í??ì?´ ê±°ë¶?ë??ì?´ ì?´ ë©?ëª¨ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+msgstr "ê¶?í??ì?´ ê±°ë¶?ë??ì?´ ì?´ ë©?ëª¨ë¥¼ ì?ì ?í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
-msgstr "ê¶?í??ì?´ ê±°ë¶?ë??ì?´ ì?´ í?ëª©ì?? ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+msgstr "ê¶?í??ì?´ ê±°ë¶?ë??ì?´ ì?´ í?ëª©ì?? ì?ì ?í?  ì?? ì??ì?µë??ë?¤"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "ì?¤ë¥?ë??ë¬¸ì?? ì?´ í??ì?¬ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "ì?¤ë¥? ë??ë¬¸ì?? ì?´ í??ì?¬ë¥¼ ì?ì ?í?  ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "ì?¤ë¥?ë??ë¬¸ì?? ì?´ ì??ì??ì?? ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "ì?¤ë¥? ë??ë¬¸ì?? ì?´ ì??ì??ì?? ì?ì ?í?  ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "ì?¤ë¥?ë??ë¬¸ì?? ì?´ ë©?ëª¨ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "ì?¤ë¥? ë??ë¬¸ì?? ì?´ ë©?ëª¨ë¥¼ ì?ì ?í?  ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "ì?¤ë¥?ë??ë¬¸ì?? ì?´ í?ëª©ì?? ì§?ì?¸ ì?? ì??ì?µë??ë?¤"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "ì?¤ë¥? ë??ë¬¸ì?? ì?´ í?ëª©ì?? ì?ì ?í?  ì?? ì??ì?µë??ë?¤: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -4096,136 +3743,151 @@ msgid "Enter Delegate"
 msgstr "ë??ë¦¬ì?¸ì?? ì??ë ¥í??ì?ì?¤"
 
 # Alarm -> ì??ë¦¼, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "_Alarms"
 msgstr "ì??ë¦¼(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
 msgstr "ì?´ í??ì?¬ì?? ì??ë¦¼ì?? ì?¤ì ?í??ê±°ë?? í?´ì ?í??ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "ì??ê°?ì?? ì?½ì?? ì??ì??ì?¼ë¡? í??ì??(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "ì??ê°?ì?? ì?½ì?? ì??ì??ì?¼ë¡? í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
 msgstr "ë°?ë³µ(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:240
 msgid "Make this a recurring event"
 msgstr "ë°?ë³µ í??ì?¬ë¡? ë§?ë?ë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../plugins/groupwise-features/send-options.c:210
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "ë³´ë?´ê¸° ì?µì??"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
 msgstr "ê³ ê¸? ë³´ë?´ê¸° ì?µì?? ë?£ê¸°"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
 msgstr "í??ë£¨ ì¢?ì?¼ í??ì?¬(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:257
 msgid "Toggles whether to have All Day Event"
 msgstr "í??ë£¨ ì¢?ì?¼ í??ì?¬ê°? ì??ë??ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "ì??ê°?ì?? ì?½ì?? ì??ì??ì?¼ë¡? í??ì??(_B)"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "ì??ê°?ì?? ì?½ì?? ì??ì??ì?¼ë¡? í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
-
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:266
 msgid "_Free/Busy"
 msgstr "ì?½ì?? ì??ì??/ì??ì??(_F):"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:268
 msgid "Query free / busy information for the attendees"
 msgstr "ì°¸ì??ì??ì?? ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ë¥¼ ì??ì??ë´?ë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
-msgid "Appoint_ment"
-msgstr "ì?½ì??(_M)"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2610
+msgid "Appointment"
+msgstr "ì?½ì??"
+
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "ì°¸ì??ì??"
+
+# tooltip
+#: ../calendar/gui/dialogs/event-editor.c:578
+msgid "Print this event"
+msgstr "ì?´ í??ì?¬ë¥¼ ì?¸ì??í?©ë??ë?¤"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "í??ì?¬ì?? ì??ì?? ì??ê°?ì?´ ê³¼ê±°ì??ë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "í??ì?¬ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì? í??í?? ë?¬ë ¥ì?´ ì?½ê¸° ì ?ì?©ì??ë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "í??ì?¬ ì ?ì²´ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì£¼ìµ?ì??ê°? ì??ë??ë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "í??ì?¬ì?? ì??ë¦¼ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ì£¼ìµ?ì??(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
 msgstr "ë??ë¦¬ì?¸(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "ì°¸ì??ì??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "í??ì?¬ì?? ì??ì?? ë? ì§?ê°? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "í??ì?¬ì?? ë?? ë? ì§?ê°? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "ì??ì?? ë? ì§?ê°? í??ë ¸ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "ë?? ë? ì§?ê°? í??ë ¸ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "ì??ì?? ì??ê°?ì?´ í??ë ¸ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "ë?? ì??ê°?ì?´ í??ë ¸ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "ì? í??í??ì?  ì£¼ìµ?ì??ê°? ì?´ì ? ê³?ì ?ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "ì£¼ìµ?ì??ê°? í??ì??í?©ë??ë?¤."
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "ìµ?ì??í?? ì°¸ì??ì??ê°? í?? ì?¬ë??ì?? í??ì??í?©ë??ë?¤."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ë?¬ë ¥ì?? ì?´ ì?? ì??ì?µë??ë?¤."
@@ -4236,22 +3898,22 @@ 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:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "%s ì??ê²©ì?¼ë¡? ì??ì??í?©ë??ë?¤"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ì?½ì?? %dì?¼ ì ?ì??"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -4259,118 +3921,129 @@ msgstr[0] "ì?½ì?? %dì??ê°? ì ?ì??"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ì?½ì?? %dë¶? ì ?ì??"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "ì?¬ì?©ì?? ì§?ì ?"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "ì??ì??"
 
-# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
-# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-msgid "1 day before appointment"
-msgstr "ì?½ì?? í??ë£¨ ì ?ì??"
-
-# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
-# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 hour before appointment"
-msgstr "ì?½ì?? í?? ì??ê°? ì ?ì??"
-
-# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
-# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-msgid "15 minutes before appointment"
-msgstr "ì?½ì?? 15ë¶? ì ?ì??"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "ì°¸ì??ì??(_S)..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "ì°¸ì??ì??(_N)..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "ì°¸ì??ì??"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "ì?¬ì?©ì?? ì?¤ì ? ì??ë¦¼:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Event Description"
 msgstr "í??ì?¬ ì?¤ëª?"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "ê°?ì??(_M):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "ì??ë¦¼(_A)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "ì?¤ëª?(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "ì??ì¹?(_L):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+msgid "_Summary:"
+msgstr "ì??ì?½(_S):"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "ì??ê°?(_T):"
 
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "ì?½ì?? í??ë£¨ ì ?ì??"
+
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "ì?½ì?? í?? ì??ê°? ì ?ì??"
+
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "ì?½ì?? 15ë¶? ì ?ì??"
+
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+msgctxt "eventpage"
 msgid "for"
 msgstr "ë?¤ì?? ë??ì??:"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
 msgid "until"
 msgstr "ë?¤ì?? ê¹?ì§?:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2614
 msgid "Memo"
 msgstr "ë©?ëª¨"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "ì?´ ë©?ëª¨ ì?¸ì??"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "ë©?ëª¨ì?? ì??ì?? ë? ì§?ê°? ê³¼ê±°ì??ë??ë?¤"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ë©?ëª¨ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì? í??í?? ë©?ëª¨ ëª©ë¡?ì?´ ì?½ê¸° ì ?ì?©ì??ë??ë?¤"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ë©?ëª¨ ì ?ì²´ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì£¼ìµ?ì??ê°? ì??ë??ë??ë?¤"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'ì?? ë©?ëª¨ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
+#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2289
+#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "ë°?ë?? ì?¬ë??"
 
@@ -4379,69 +4052,74 @@ msgstr "ë°?ë?? ì?¬ë??"
 msgid "Sta_rt date:"
 msgstr "ì??ì?? ë? ì§?(_R):"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "ê°?ì??(_M):"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "ë°?ë?? ì?¬ë??(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "ëª¨ì??(_G):"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "ë°?ë³µ í??ì?¬ë¥¼ ì??ì ?í??ë ¤ê³  í?©ë??ë?¤. ë¬´ì??ì?? ì??ì ?í??ì??ê² ì?µë??ê¹??"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "ë°?ë³µ í??ì?¬ë¥¼ ë??ë¦¬í??ë ¤ê³  í?©ë??ë?¤. ë¬´ì??ì?? ë??ë¦¬í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "ë°?ë³µ ì??ì??ì?? ì??ì ?í??ë ¤ê³  í?©ë??ë?¤. ë¬´ì??ì?? ì??ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ë°?ë³µ ë©?ëª¨ë¥¼ ì??ì ?í??ë ¤ê³  í?©ë??ë?¤. ë¬´ì??ì?? ì??ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "ì?´ ê²½ì?°ë§?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "ì?´ ê²½ì?° ë°? ì§?ë??ê°? ê²½ì?°"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "ì?´ ê²½ì?° ë°? ì??ì?¼ë¡?ì?? ê²½ì?°"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "ëª¨ë?  ê²½ì?°"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ì?´ ì?½ì??ì??ë?? ì??ë³¼ë£¨ì??ì??ì?? í?¸ì§?í?  ì?? ì??ë?? ë°?ë³µì?´ ë?¤ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "ë°?ë³µí??ë?? ë? ì§?ê°? ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "ì??ì?¼"
 
@@ -4449,7 +4127,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "ì²«ë²?ì§¸"
 
@@ -4458,7 +4136,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "ë??ë²?ì§¸"
 
@@ -4466,7 +4144,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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "ì?¸ë²?ì§¸"
 
@@ -4474,7 +4152,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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "ë?¤ë²?ì§¸"
 
@@ -4482,7 +4160,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:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "ë?¤ì?¯ë²?ì§¸"
 
@@ -4490,13 +4168,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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "ê¸°í?? ë? ì§?"
 
@@ -4504,7 +4182,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:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1ì?¼ë¶?í?° 10ì?¼"
 
@@ -4512,7 +4190,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:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11ì?¼ë¶?í?° 20ì?¼"
 
@@ -4520,14 +4198,14 @@ 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:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "21ì?¼ë¶?í?° 31ì?¼"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "ì?¼"
 
@@ -4536,33 +4214,33 @@ msgstr "ì?¼"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "ê¸°ê°?:"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "ë²?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "ì??ì?¸ ì¶?ê°?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "ê³ ì¹  ì? í?? ì?¬í?ì?? ì?»ì?´ ì?¬ ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "ì??ì?¸ ì??ì ?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "ì§?ì?¸ ì? í?? ì?¬í?ì?? ì?»ì?´ ì?¬ ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "ë? ì§?/ì??ê°?"
 
@@ -4576,7 +4254,7 @@ msgstr "ë§¤"
 msgid "Exceptions"
 msgstr "ì??ì?¸"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
 msgid "Preview"
 msgstr "ë¯¸ë¦¬ ë³´ê¸°"
 
@@ -4586,56 +4264,98 @@ msgstr "ë¯¸ë¦¬ ë³´ê¸°"
 msgid "This appointment rec_urs"
 msgstr "ì?´ ì?½ì?? ë°?ë³µ(_U)"
 
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "ì?¼"
+
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "recurrpage"
+msgid "for"
+msgstr "ë?¤ì?? ë??ì??:"
+
+# FIXME - hard to translate UI + string based on English grammar
+# "for ... occurrences"
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgctxt "recurrpage"
 msgid "forever"
 msgstr "ì??ì??í??"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "ë?¬"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "ë?¤ì?? ê¹?ì§?:"
+
+# FIXME - hard to translate UI + string based on English grammar
+# "for ... occurrences"
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "ì£¼"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ë??"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "ì?´ í??ì?¬ì?? ë?´ ì??ë¦¼ ë³´ë?´ê¸°"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "ì?? ì°¸ì??ì??ì??ê²?ë§? ì??ë¦¼(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "ì??ë£? ë? ì§?ê°? ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:483
 msgid "Web Page"
 msgstr "ì?¹ í??ì?´ì§?"
 
 #. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2697 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, c-format
+msgid "Canceled"
+msgstr "ì·¨ì??í?¨"
+
+#. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2694 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "ì??ë£?ë?¨"
@@ -4643,46 +4363,46 @@ msgstr "ì??ë£?ë?¨"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1183 ../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:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2691
 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:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1181 ../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:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "ë³´í?µ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2688 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "ì??ì?? ì??í?¨"
 
@@ -4698,8 +4418,8 @@ msgstr "ì??í??(_U):"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4708,8 +4428,8 @@ msgstr "ì??í??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "ì ?ì??ì??ë?¨"
 
@@ -4718,7 +4438,7 @@ msgid "_Date completed:"
 msgstr "ì??ë£?í?? ë? ì§?(_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "ì?°ì? ì??ì??(_P):"
 
@@ -4726,53 +4446,62 @@ msgstr "ì?°ì? ì??ì??(_P):"
 msgid "_Web Page:"
 msgstr "ì?¹ í??ì?´ì§?(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
 msgid "_Status Details"
 msgstr "ì??í?? ì??ì?¸í??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
 msgstr "ë??ë¥´ë©´ ì??ì??ì?? ì??ì?¸í?? ì??í?? ì ?ë³´ë¥¼ ë°?ê¾¸ê±°ë?? ë´?ë??ë?¤"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "ë³´ë?´ê¸° ì?µì??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "ì??ì??(_T)"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2612
+#: ../widgets/misc/e-send-options.c:503
+msgid "Task"
+msgstr "ì??ì??"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "ì??ì?? ì??ì?¸í??"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+msgid "Print this task"
+msgstr "ì?´ ì??ì?? ì?¸ì??"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "ì??ì??ì?? ì??ì?? ë? ì§?ê°? ê³¼ê±°ì??ë??ë?¤"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "ì??ì??ì?? ë§?ê°? ë? ì§?ê°? ê³¼ê±°ì??ë??ë?¤"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ì??ì??ì?? í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì? í??í?? ì??ì?? ëª©ë¡?ì?´ ì?½ê¸° ì ?ì?©ì??ë??ë?¤"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ì??ì?? ì ?ì²´ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤. ì£¼ìµ?ì??ê°? ì??ë??ë??ë?¤"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "ì£¼ìµ?ì??(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "ë§?ê°? ë? ì§?ê°? ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'ì?? ì??ì??ì?? ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "ì°¸ì??ì??(_N)..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "ë¶?ë¥?(_I)..."
@@ -4860,7 +4589,7 @@ msgstr "%s (%s)"
 msgid "%s for an unknown trigger type"
 msgstr "ì?? ì?? ì??ë?? ì??ì?? ì?µì??ì?? ë??í?? %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
 msgid "Untitled"
 msgstr "ì ?ëª© ì??ì??"
 
@@ -4869,7 +4598,7 @@ msgid "Categories:"
 msgstr "ë¶?ë¥?:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "ì??ì?½:"
 
@@ -4884,8 +4613,8 @@ msgstr "ë§?ê°? ë? ì§?:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "ì??í??:"
 
@@ -4894,8 +4623,8 @@ msgid "Priority:"
 msgstr "ì?°ì?  ì??ì??:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "ì?¤ëª?:"
 
@@ -4910,32 +4639,32 @@ msgstr "ì?¹ í??ì?´ì§?:"
 msgid "Created"
 msgstr "ë§?ë?¦"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "ë?? ë? ì§?"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "ìµ?ê·¼ ë°?ë??"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "ì??ì?? ë? ì§?"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
 msgid "Free"
 msgstr "ì?½ì?? ì??ì??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "ì?½ì?? ì??ì??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4946,63 +4675,47 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ì??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "ì??ë??ì?¤"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "ê¸°ë³¸ í??ë¡?ê·¸ë?¨"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "ì?¸ ì?¤ì ?"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "í??ë¡?ê·¸ë?¨ ì ?ì²´ ì?¤ì ?"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2345
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "ì?? ì?? ì??ì??"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1271
 msgid "Recurring"
 msgstr "ë°?ë³µë?¨"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1273
 msgid "Assigned"
 msgstr "ì??ì?½ë?¨"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2175
 #, c-format
 msgid "Opening %s"
 msgstr "%s ì?¬ë?? ì¤?ì??ë??ë?¤"
@@ -5039,97 +4752,97 @@ msgid "Start date"
 msgstr "ì??ì?? ë? ì§?"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "í??í??"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "ì? í??í?? í??ì?¬ë¥¼ í?´ë¦½ë³´ë??ë¡? ì??ë?¼ë??ë??ë?¤"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "ì? í??í?? í??ì?¬ë¥¼ í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "í?´ë¦½ë³´ë??ì??ì?? í??ì?¬ë¥¼ ë¶?ì?¬ ë?£ì?µë??ë?¤"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "ì? í??í?? í??ì?¬ë¥¼ ì?ì ?í?©ë??ë?¤"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "ì? í??í?? ì?¤ë¸?ì ?í?¸ë¥¼ ì?ì ?í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
 msgstr "ì?¤ë¸?ì ?í?¸ë¥¼ ì??ë?°ì?´í?¸í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Accepted"
 msgstr "ì??ë?½"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Declined"
 msgstr "ê±°ë¶?"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1722
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "ì? ì ?ì ?"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 msgid "Delegated"
 msgstr "ë??ë¦¬"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1724
 msgid "Needs action"
 msgstr "ë??ì?? í??ì??"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/e-memo-table.c:530
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ì£¼ìµ?ì??: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:748
 #, c-format
 msgid "Organizer: %s"
 msgstr "ì£¼ìµ?ì??: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1888 ../calendar/gui/print.c:2646
 #, c-format
 msgid "Location: %s"
 msgstr "ì??ì¹?: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1919
 #, c-format
 msgid "Time: %s %s"
 msgstr "ì??ê°?: %s %s"
@@ -5172,10 +4885,10 @@ msgstr "ë³´ì¡° í??ì¤? ì??ê°?ë?? í??ì??"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
-msgstr "%B %eì?¼ %A"
+msgstr "%B %dì?¼ %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -5183,10 +4896,10 @@ msgstr "%B %eì?¼ %A"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%b %eì?¼ (%a)"
 
@@ -5195,31 +4908,35 @@ msgstr "%b %eì?¼ (%a)"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
 msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "ì?¤ì ?"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "ì?¤í??"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2646
 #, c-format
 msgid "Week %d"
 msgstr "%dì£¼"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "ë°?ë³µ:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "ì??. (ë³µì?¡í?? ë°?ë³µ)"
@@ -5301,7 +5018,7 @@ msgstr "ë??"
 msgid "Due"
 msgstr "ê¸°í??"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "iCalendar ì ?ë³´"
 
@@ -5310,314 +5027,313 @@ msgstr "iCalendar ì ?ë³´"
 msgid "iCalendar Error"
 msgstr "iCalendar ì?¤ë¥?"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "ëª¨ë¥´ë?? ì?¬ë??"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"Please review the following information, and then select an action from the "
+"menu below."
 msgstr ""
-"<br> ë?¤ì?? ì ?ë³´ë¥¼ ë?¤ì?? í??ì?¸í??ì??ê³ , ì??ë??ì?? ë©?ë?´ì??ì?? ì?´ë?¤ ë??ì??ì?? í? ì§? ì? í??í??ì?ì??"
-"ì?¤."
+"ë?¤ì?? ì ?ë³´ë¥¼ ë?¤ì?? í??ì?¸í??ì??ê³ , ì??ë??ì?? ë©?ë?´ì??ì?? ì?´ë?¤ ë??ì??ì?? í? ì§? ì? í??í??ì?ì??ì?¤."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2320
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Tentatively Accepted"
 msgstr "ì? ì ?ì ?ì?¼ë¡? ì??ë?½"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "ëª¨ì??ì?´ ì·¨ì??ë??ì??ì§?ë§?, ì?´ ëª¨ì??ì?´ ë?¬ë ¥ì?? ë?¤ì?´ ì??ì§? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "ì??ì??ì?´ ì·¨ì??ë??ì??ì§?ë§?, ì?´ ì??ì??ì?´ ì??ì?? ëª©ë¡?ì?? ë?¤ì?´ ì??ì§? ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b>ë??ì?´ ëª¨ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤."
+msgid "%s has published meeting information."
+msgstr "%së??ì?´ ëª¨ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "ëª¨ì?? ì ?ë³´"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b>ë??ì?´ ëª¨ì??ì?? %së??ì?? ì°¸ì??ì?? ì??ì²í??ì?µë??ë?¤."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%së??ì?´ ëª¨ì??ì?? %së??ì?? ì°¸ì??ì?? ì??ì²í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b>ë??ì?´ ëª¨ì??ì?? ì°¸ì??í??ì??ê¸°ë¥¼ ì??ì²í??ì?µë??ë?¤."
+msgid "%s requests your presence at a meeting."
+msgstr "%së??ì?´ ëª¨ì??ì?? ì°¸ì??í??ì??ê¸°ë¥¼ ì??ì²í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "ëª¨ì?? ì ?ì??"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b>ë??ì?´ ê¸°ì¡´ ëª¨ì??ì?? ë?¤ì?´ê°?ê³  ì?¶ì?´í?©ë??ë?¤."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%së??ì?´ ê¸°ì¡´ ëª¨ì??ì?? ë?¤ì?´ê°?ê³  ì?¶ì?´í?©ë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "ëª¨ì?? ì??ë?°ì?´í?¸"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b>ë??ì?´ ê°?ì?¥ ìµ?ê·¼ì?? ëª¨ì?? ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%së??ì?´ ê°?ì?¥ ìµ?ê·¼ì?? ëª¨ì?? ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "ëª¨ì?? ì??ë?°ì?´í?¸ ì??ì²"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b>ë??ì?´ ëª¨ì?? ì??ì²ì?? í??ì? í??ì?µë??ë?¤."
+msgid "%s has replied to a meeting request."
+msgstr "%së??ì?´ ëª¨ì?? ì??ì²ì?? í??ì? í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "ëª¨ì?? í??ì? "
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b>ë??ì?´ ëª¨ì??ì?? ì·¨ì??í??ì?µë??ë?¤."
+msgid "%s has canceled a meeting."
+msgstr "%së??ì?´ ëª¨ì??ì?? ì·¨ì??í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "ëª¨ì?? ì·¨ì??"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b>ë??ì?´ ì?´í?´í??ê¸° ì?´ë ¤ì?´ ë©?ì??ì§?ë¥¼ ë³´ë??ì?µë??ë?¤."
+msgid "%s has sent an unintelligible message."
+msgstr "%së??ì?´ ì?´í?´í??ê¸° ì?´ë ¤ì?´ ë©?ì??ì§?ë¥¼ ë³´ë??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "ì??ëª»ë?? ëª¨ì?? ë©?ì??ì§?"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b>ë??ì?´ ì??ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤."
+msgid "%s has published task information."
+msgstr "%së??ì?´ ì??ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "ì??ì?? ì ?ë³´"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b>ë??ì?´ %së??ì??ê²? ì??ì??ì?? ì??í??í??ê¸¸ ì??ì²í??ì?¨ì?µë??ë?¤."
+msgid "%s requests %s to perform a task."
+msgstr "%së??ì?´ %së??ì??ê²? ì??ì??ì?? ì??í??í??ê¸¸ ì??ì²í??ì?¨ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b>ë??ì?´ ì??ì??ì?? ì??í??í??ê¸¸ ì??ì²í??ì?¨ì?µë??ë?¤."
+msgid "%s requests you perform a task."
+msgstr "%së??ì?´ ì??ì??ì?? ì??í??í??ê¸¸ ì??ì²í??ì?¨ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "ì??ì?? ì ?ì??"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b>ë??ì?´ ê¸°ì¡´ ì??ì??ì?? ë?¤ì?´ê°?ê³  ì?¶ì?´í?©ë??ë?¤."
+msgid "%s wishes to be added to an existing task."
+msgstr "%së??ì?´ ê¸°ì¡´ ì??ì??ì?? ë?¤ì?´ê°?ê³  ì?¶ì?´í?©ë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "ì??ì?? ì??ë?°ì?´í?¸"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b>ë??ì?´ ê°?ì?¥ ìµ?ê·¼ì?? ì??ì?? ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤."
+msgid "%s wishes to receive the latest task information."
+msgstr "%së??ì?´ ê°?ì?¥ ìµ?ê·¼ì?? ì??ì?? ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "ì??ì?? ì??ë?°ì?´í?¸ ì??ì²"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b>ë??ì?´ ì??ì?? í? ë?¹ì?? í??ì? í??ì?µë??ë?¤."
+msgid "%s has replied to a task assignment."
+msgstr "%së??ì?´ ì??ì?? í? ë?¹ì?? í??ì? í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "ì??ì?? í??ì? "
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b>ë??ì?´ ì??ì??ì?? ì·¨ì??í??ì?µë??ë?¤."
+msgid "%s has canceled a task."
+msgstr "%së??ì?´ ì??ì??ì?? ì·¨ì??í??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "ì??ì?? ì·¨ì??"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "ì??ëª»ë?? ì??ì?? ë©?ì??ì§?"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b>ì?´(ê°?) ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤."
+msgid "%s has published free/busy information."
+msgstr "%sì?´(ê°?) ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤."
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b>ì?´(ê°?) ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ë¥¼ ì??ì²í??ì?µë??ë?¤."
+msgid "%s requests your free/busy information."
+msgstr "%sì?´(ê°?) ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ë¥¼ ì??ì²í??ì?µë??ë?¤."
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì??ì²"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b>ì?´(ê°?) ì?½ì?? ì??ì??/ì??ì?? ì??ì²ì?? í??ì? í??ì?µë??ë?¤."
+msgid "%s has replied to a free/busy request."
+msgstr "%sì?´(ê°?) ì?½ì?? ì??ì??/ì??ì?? ì??ì²ì?? í??ì? í??ì?µë??ë?¤."
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? í??ì? "
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "í??ë¦° ì?½ì?? ì??ì??/ì??ì?? ë©?ì??ì§?"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "ë©?ì??ì§?ì?? í??ì??ì?´ ì?¬ë°?ë¥´ì§? ì??ì?? ê²?ì?¼ë¡? ë³´ì??ë??ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "ì?´ ë©?ì??ì§?ì??ë?? ì§?ì??í??ì§? ì??ë?? ì??ì²ë§? ë?¤ì?´ ì??ì?µë??ë?¤."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "ì²¨ë¶?ì?? ì?¬ë°?ë¥¸ ë?¬ë ¥ ë©?ì??ì§?ê°? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "ì?´ ì²¨ë¶?ë¥¼ ë³¼ ì?? ì??ë?? ë?¬ë ¥ ì??ì?´í??ì?´ ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "ì??ë?°ì?´í?¸ ë§?ì¹¨\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ì?¤ë¸?ì ?í?¸ê°? ì??ëª»ë??ì??ê³  ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "í??ì?¬ ì°¸ì??ì??ê°? ì??ë?? ì?¬ë??ì?´ ì?´ í??ì? ì?? í??ì?µë??ë?¤. ì°¸ì??ì??ë¡? ì¶?ê°?í??ì??ê² ì?µë??ê¹??"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "ì??ëª»ë?? ì??í??ë??ë¬¸ì?? ì°¸ì??ì?? ì??í??ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤!\n"
+msgstr "ì??ëª»ë?? ì??í?? ë??ë¬¸ì?? ì°¸ì??ì?? ì??í??ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "ì°¸ì??ì??ì?? ì??í?? ì??ë?°ì?´í?¸ë??ì??ì?µë??ë?¤\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../calendar/gui/e-itip-control.c:2084
 #: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ì?´ í?ëª©ì?´ ë?? ì?´ì?? ì??ê¸° ë??ë¬¸ì?? ì°¸ì??ì?? ì??í??ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "í?ëª©ì?? ë³´ë??ì?µë??ë?¤!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "í?ëª©ì?? ë³´ë?¼ ì?? ì??ì?µë??ë?¤!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "ë??ì??ì?? ê³ ë¥´ì?ì??ì?¤:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "ì??ë?µë°?ë??"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "ì??ë?°ì?´í?¸"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "ì??ë?½"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "ì? ì ?ì ?ì?¼ë¡? ì??ë?½"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "ê±°ë¶?"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ ë³´ë?´ê¸°"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "ì??ë?°ì?´í?¸ ì??ë?µ ì??í??"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "ê°?ì?¥ ìµ?ê·¼ ì ?ë³´ ë³´ë?´ê¸°"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
+#: ../widgets/misc/e-activity-proxy.c:300
 msgid "Cancel"
 msgstr "ì·¨ì??"
 
@@ -5668,81 +5384,81 @@ msgid "Resources"
 msgstr "ì??ì??"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "ê°?ì?¸"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ëª¨ì??"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "ì??ì??"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "ë°©"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "ì??ì?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 #: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "í??ì?? ì°¸ì??ì??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "ì? í?? ì°¸ì??ì??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "ë¶?ì°¸ì??"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "ë??ì?? í??ì??"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
 msgid "Attendee                          "
 msgstr "ì°¸ì??ì??"
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "ì§?í??ì¤?"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
-msgstr "%Yë?? %B %eì?¼ %A"
+msgstr "%Yë?? %B %dì?¼ %A"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2407
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -5752,69 +5468,65 @@ msgstr "%Y/%m/%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "ë¶?ì?¬ ì¤?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "ì ?ë³´ ì??ì??"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "ì°¸ì??ì??(_T)..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "ì?µì??(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
-msgstr "ê·¼ë¬´ ì??ê°?ë§? ë³´ê¸°(_O)"
+msgstr "ê·¼ë¬´ ì??ê°?ë§? ë³´ì?´ê¸°(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
-msgstr "ì¶?ì??í?´ì?? ë³´ê¸°(_Z)"
+msgstr "ì¶?ì??í?´ì?? ë³´ì?´ê¸°(_Z)"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì??ë?°ì?´í?¸(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
 # Autopick -> ë¹? ì??ê°? ì°¾ê¸°, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "ë¹? ì??ê°? ì°¾ê¸°(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "ëª¨ë?  ì?¬ë??ê³¼ ì??ì??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "ëª¨ë?  ì?¬ë??ê³¼ ì??ì?? í?? ê°?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "í??ì??í?? ì?¬ë??(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "í??ì??í?? ì?¬ë??ê³¼ ì??ì?? í?? ê°?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "ì??ì?? ì??ê°?(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "ë§?ì¹¨ ì??ê°?(_E):"
 
@@ -5842,45 +5554,47 @@ msgstr "ì?¸ì?´"
 msgid "Member"
 msgstr "êµ¬ì?±ì??"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../calendar/gui/e-memo-table.c:414
+#: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "ë©?ëª¨"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
 msgid "* No Summary *"
 msgstr "* ì??ì?½ ì??ì?? *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:577 ../calendar/gui/e-task-table.c:789
 msgid "Start: "
 msgstr "ì??ì??: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:596 ../calendar/gui/e-task-table.c:807
 msgid "Due: "
 msgstr "ê¸°í??: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:712
 msgid "Cut selected memos to the clipboard"
 msgstr "ì? í??í?? ë©?ëª¨ë¥¼ í?´ë¦½ë³´ë??ë¡? ì??ë?¼ ë??ë??ë?¤"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:718
 msgid "Copy selected memos to the clipboard"
 msgstr "ì? í??í?? ë©?ëª¨ë¥¼ í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:724
 msgid "Paste memos from the clipboard"
 msgstr "í?´ë¦½ë³´ë??ì??ì?? ë©?ëª¨ë¥¼ ë¶?ì?¬ ë?£ì?µë??ë?¤"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "ì? í??í?? ë©?ëª¨ë¥¼ ì?ì ?í?©ë??ë?¤"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:736
 msgid "Select all visible memos"
 msgstr "ë³´ì?´ë?? ëª¨ë?  ë©?ì??ì§? ì? í??"
 
@@ -5888,146 +5602,111 @@ msgstr "ë³´ì?´ë?? ëª¨ë?  ë©?ì??ì§? ì? í??"
 msgid "Click to add a memo"
 msgstr "ë©?ëª¨ë¥¼ ì¶?ê°?í??ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2072
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "ì??ì??"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:935
 msgid "Cut selected tasks to the clipboard"
 msgstr "ì? í??í?? ì??ì??ì?? í?´ë¦½ë³´ë??ë¡? ì??ë?¼ë??ë??ë?¤"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:941
 msgid "Copy selected tasks to the clipboard"
 msgstr "ì? í??í?? ì??ì??ì?? í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:947
 msgid "Paste tasks from the clipboard"
 msgstr "í?´ë¦½ë³´ë??ì??ì?? ì??ì??ì?? ë¶?ì?¬ ë?£ì?µë??ë?¤"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:953
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "ì? í??í?? ì??ì??ì?? ì?ì ?í?©ë??ë?¤"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:959
 msgid "Select all visible tasks"
 msgstr "ë³´ì?´ë?? ëª¨ë?  ì??ì?? ì? í??"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "í??ì¤? ì??ê°?ë??ë¥¼ ì? í??í??ì?ì??ì?¤"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%B %eì?¼"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "ì??ë¦¼ ì??ì??."
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "ë°?ë³µ ì??ì??."
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "ëª¨ì??."
 
 # a11y ì?¤í?¸ë§?, eventë?? í??ì?¬ê°? ì??ë??ë?¼ UI ì?´ë²¤í?¸
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "ë?¬ë ¥ ì?´ë²¤í?¸: ì??ì?½ì?? %s."
 
 # a11y ì?¤í?¸ë§?, eventë?? í??ì?¬ê°? ì??ë??ë?¼ UI ì?´ë²¤í?¸
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "ë?¬ë ¥ ì?´ë²¤í?¸: ì??ì?½ ì??ì??."
 
 # a11y ì?¤í?¸ë§?, eventë?? í??ì?¬ê°? ì??ë??ë?¼ UI ì?´ë²¤í?¸
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "ë?¬ë ¥ ë³´ê¸° ì?´ë²¤í?¸"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "í?¬ì»¤ì?¤ ë°?ì??"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "ì?? ì?½ì??"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "ì?? í??ë£¨ ì¢?ì?¼ í??ì?¬"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "ì?? ëª¨ì??"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "ì?¤ë??ë¡? ì?´ë??"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "ë? ì§?ë¡? ì?´ë??"
 
@@ -6037,7 +5716,7 @@ msgid "a table to view and select the current time range"
 msgstr "í??ì?¬ ì??ê°? êµ¬ê°?ì?? ë³´ê³  ì? í??í??ë?? í??"
 
 # a11y ì?¤í?¸ë§?, eventë?? í??ì?¬ê°? ì??ë??ë?¼ UI ì?´ë²¤í?¸
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6046,14 +5725,14 @@ msgstr[0] "ì?´ë²¤í?¸ %dê°? ì??ì??."
 # a11y ì?¤í?¸ë§?, eventë?? í??ì?¬ê°? ì??ë??ë?¼ UI ì?´ë²¤í?¸
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "ì?´ë²¤í?¸ ì??ì??."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°: %s. %s"
@@ -6061,47 +5740,47 @@ msgstr "ê·¼ë¬´ì?¼ ì£¼ë³? ë³´ê¸°: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ì?¼ë³? ë³´ê¸°: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for a work week"
 msgstr "ë?¬ë ¥ ë³´ê¸°, ê·¼ë¬´ ì£¼ ë?¨ì??"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for one or more days"
 msgstr "ë?¬ë ¥ ë³´ê¸°, ì?¼ ë?¨ì??"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "ê·¸ë?? ë?¬ë ¥"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
-msgstr "%Yë?? %b %eì?¼ %A"
+msgstr "%Yë?? %b %dì?¼ %A"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%Yë?? %b %eì?¼ (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
 msgstr "%Yë?? %b %eì?¼"
 
@@ -6124,15 +5803,15 @@ msgstr "ì??ë³? ë³´ê¸°: %s. %s"
 msgid "Week View: %s. %s"
 msgstr "ì£¼ë³? ë³´ê¸°: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "í?? ë?¬ ë?¨ì??ë¡? ë?¬ë ¥ ë³´ê¸°"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
 msgstr "ì£¼ ë?¨ì??ë¡? ë?¬ë ¥ ë³´ê¸°"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2306
 msgid "Purging"
 msgstr "ë¹?ì?°ë?? ì¤?"
 
@@ -6185,41 +5864,42 @@ msgid "Select Date"
 msgstr "ë? ì§? ì? í??"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "9ì??"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "ì?¤ë?? ì? í??(_T)"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "ì?¤ë?? ì? í??(_S)"
+msgid "September"
+msgstr "9ì??"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "ì£¼ìµ?ì??ë¥¼ ê²°ì ?í?´ì?¼ í?©ë??ë?¤."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "ì°¸ì??ì??ê°? ìµ?ì??í?? í?? ì?¬ë??ì?? í??ì??í?©ë??ë?¤"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "í??ì?¬ ì ?ë³´"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "ì??ì?? ì ?ë³´"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "ë©?ëª¨ ì ?ë³´"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "ë?¬ë ¥ ì ?ë³´"
 
@@ -6227,7 +5907,7 @@ msgstr "ë?¬ë ¥ ì ?ë³´"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ì??ë?½"
@@ -6236,7 +5916,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:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ì? ì ?ì ?ì?¼ë¡? ì??ë?½"
@@ -6248,7 +5928,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:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "ê±°ì ?"
@@ -6257,7 +5937,7 @@ msgstr "ê±°ì ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ë??ë¦¬"
@@ -6265,7 +5945,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:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ì??ë?°ì?´í?¸ë?¨"
@@ -6273,7 +5953,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:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ì·¨ì??"
@@ -6281,7 +5961,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:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ì??ë¡?ì?´ ì?¬í?"
@@ -6289,31 +5969,31 @@ 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:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ë°?ë??ì ?ì??"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ (%së¶?í?° %sê¹?ì§?)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iCalendar ì ?ë³´"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "ë¦¬ì??ì?¤ë¥¼ ì??ì?½í?  ì?? ì??ì?µë??ë?¤. ì?? í??ì?¬ê°? ë?¤ë¥¸ í??ì?¬ì?? ì¶©ë??í?©ë??ë?¤."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "ë¦¬ì??ì?¤ë¥¼ ì??ì?½í?  ì?? ì??ì?µë??ë?¤. ì?¤ë¥?ë??:"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "ì?´ í??ì?¬ì?? ì°¸ì??ì??ì?¬ì?¼ í?©ë??ë?¤."
 
@@ -6469,49 +6149,78 @@ msgstr "ê¸?"
 msgid "Sa"
 msgstr "í? "
 
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "ì?½ì??"
+# FIXME - hard to translate UI + string based on English grammar
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2449
+msgid " to "
+msgstr "ë¶?í?° "
 
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "ì??ì??"
+# FIXME - hard to translate UI + string based on English grammar
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2457
+msgid " (Completed "
+msgstr " (ì??ë£?ë?¨ "
+
+# FIXME - hard to translate UI + string based on English grammar
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2461
+msgid "Completed "
+msgstr "ì??ë£?ë?¨ "
+
+# FIXME - hard to translate UI + string based on English grammar
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2469
+msgid " (Due "
+msgstr " (ê¸°í?? "
+
+# FIXME - hard to translate UI + string based on English grammar
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2474
+msgid "Due "
+msgstr "ê¸°í?? "
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2637
 #, c-format
 msgid "Summary: %s"
 msgstr "ì??ì?½: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2661
 msgid "Attendees: "
 msgstr "ì°¸ì??ì??: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2704
 #, c-format
 msgid "Status: %s"
 msgstr "ì??í??: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2719
 #, c-format
 msgid "Priority: %s"
 msgstr "ì?°ì? ì??ì??: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2737
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "í?¼ì?¼í?¸ ì??ë£?: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2748
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2761
 #, c-format
 msgid "Categories: %s"
 msgstr "ë¶?ë¥?: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2772
 msgid "Contacts: "
 msgstr "ì?°ë?½ì²?:"
 
@@ -6520,10 +6229,6 @@ msgstr "ì?°ë?½ì²?:"
 msgid "% Completed"
 msgstr "% ì??ë£?"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "ì·¨ì??í?¨"
-
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "ì§?í?? ì¤?"
@@ -6538,46 +6243,192 @@ msgstr "ë³´ë?¤ í?¼"
 msgid "is less than"
 msgstr "ë³´ë?¤ ì ?ì??"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "ì?½ì?? ë°? ëª¨ì??"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:1835
 msgid "Opening calendar"
 msgstr "ë?¬ë ¥ì?? ì?¬ë?? ì¤?ì??ë??ë?¤"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar í??ì?¼ (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "ì??ë³¼ë£¨ì?? iCalendar ê°?ì ¸ì?¤ê¸°"
 
 # Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "ë¯¸ë¦¬ ì??ë¦¼!"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "vCalendar í??ì?¼ (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "vCalendar í??ì?¼ (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "ì??ë³¼ë£¨ì?? vCalendar ê°?ì ¸ì?¤ê¸°"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "ë?¬ë ¥ í??ì?¬"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "ì??ë³¼ë£¨ì?? ë?¬ë ¥ ë??ë??í?? ê°?ì ¸ì?¤ê¸°"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "ëª¨ì??"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "í??ì?¬"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "ì??ì??"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "ë©?ëª¨"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "ë°?ë³µ ì??ì??"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "ì?¸ì?¤í?´ì?¤ì??"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "ì??ë¦¼ ì??ì??"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "ì²¨ë¶? ì??ì??"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "ê³µê°?"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "ê°?ì?¸"
+
+# ë¹?ë°? ì?µì??
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "ë¹?ë°?"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "ë?±ê¸?"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "ì??ì?½"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "ì??ì¹?"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "ì??ì??"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "ê¸°í??"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "ë??"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "ë¶?ë¥?"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "ì??ë£?ë?¨"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "ì£¼ìµ?ì??"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "ì°¸ì??ì??"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "ì?¤ëª?"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "í??í??"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -8129,178 +7980,158 @@ msgstr "í??í??ì??/ì??ë¦¬ì?¤"
 msgid "Pacific/Yap"
 msgstr "í??í??ì??/ì??"
 
-#: ../composer/e-composer-actions.c:79
-msgid "Untitled Message"
-msgstr "ì ?ëª© ì??ë?? ë©?ì??ì§?"
-
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:245
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Attach a file"
 msgstr "í??ì?¼ì?? ì²¨ë¶?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:286
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:250
+#: ../widgets/misc/e-signature-editor.c:206
 msgid "_Close"
 msgstr "ë?«ê¸°(_C)"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:252
 msgid "Close the current file"
 msgstr "í??ì?¬ í??ì?¼ì?? ë?«ì?µë??ë?¤"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:257
 msgid "_Print..."
 msgstr "ì?¸ì??(_P)..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:264
 msgid "Print Pre_view"
 msgstr "ì?¸ì?? ë¯¸ë¦¬ ë³´ê¸°(_V)"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "í??ì?¬ í??ì?¼ì?? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
 msgstr "ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥(_A)..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:280
 msgid "Save the current file with a different name"
 msgstr "í??ì?¬ í??ì?¼ì?? ë?¤ë¥¸ ì?´ë¦?ì?¼ë¡? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:285
 msgid "Save as _Draft"
 msgstr "ì??ì?? ë³´ê´?í?¨ì?? ì ?ì?¥(_D)"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:287
 msgid "Save as draft"
 msgstr "ì??ì?? ë³´ê´?í?¨ì?? ì ?ì?¥"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
 msgid "S_end"
 msgstr "ë³´ë?´ê¸°(_E)"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:294
 msgid "Send this message"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ ì§?ê¸? ë³´ë??ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:299
 msgid "New _Message"
 msgstr "ì?? ë©?ì??ì§?(_M)"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:301
 msgid "Open New Message window"
 msgstr "ì?? ë©?ì??ì§? ì°½ì?? ì?½ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:308
 msgid "Character _Encoding"
 msgstr "ë¬¸ì?? ì?¸ì½?ë?©(_E)"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:325
 msgid "PGP _Encrypt"
 msgstr "PGP ì??í?¸í??(_E)"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:327
 msgid "Encrypt this message with PGP"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ PGPë¡? ì??í?¸í??í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:333
 msgid "PGP _Sign"
 msgstr "PGP ì??ëª?(_S)"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:335
 msgid "Sign this message with your PGP key"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ PGPí?¤ë¡? ì??ëª?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:341
 msgid "_Prioritize Message"
 msgstr "ë©?ì??ì§? ì?°ì? ì??ì?? ë??ì?´ê¸°(_P)"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:343
 msgid "Set the message priority to high"
 msgstr "ë©?ì??ì§? ì?°ì? ì??ì??ë¥¼ ë??ì??ë??ë?¤"
 
 # read receipt -> ë?´ì?© ì?½ì?? í??ì?¸, Microsoft Office XP ì°¸ê³ 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:349
 msgid "Re_quest Read Receipt"
 msgstr "ë?´ì?© ì?½ì?? í??ì?¸ ì??ì²(_Q)"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:351
 msgid "Get delivery notification when your message is read"
 msgstr "ë©?ì??ì§?ë¥¼ ì?½ì?¼ë©´ ë°°ë?¬ í??ì?¸ ë°?ê¸°"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:357
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ì??í?¸í??(_C)"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:359
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ S/MIME ì??í?¸í?? ì?¸ì¦?ì??ë¡? ì??í?¸í??í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:365
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ì??ëª?(_N)"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:367
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ S/MIME ì??ëª? ì¦?ëª?ì?¼ë¡? ì??ëª?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:373
 msgid "_Bcc Field"
 msgstr "ì?¨ì?? ì°¸ì¡° í?ëª©(_B)"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:375
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ì?¨ì?? ì°¸ì¡° í?ëª©ì?? í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:381
 msgid "_Cc Field"
 msgstr "ì°¸ì¡° í?ëª©(_C)"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:383
 msgid "Toggles whether the CC field is displayed"
 msgstr "ì°¸ì¡° í?ëª©ì?? í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:425
-msgid "_From Field"
-msgstr "ë°?ì?  í?ëª©(_F)"
-
-#: ../composer/e-composer-actions.c:427
-msgid "Toggles whether the From chooser is displayed"
-msgstr "ë°?ì?  í?ëª©ì?? í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
-
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:389
 msgid "_Reply-To Field"
 msgstr "í??ì?  ì£¼ì?? í?ëª©(_R)"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:391
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "í??ì?  ì£¼ì?? í?ëª©ì?? í??ì??í? ì§? í? ê¸?í?©ë??ë?¤"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:434
 msgid "Save Draft"
 msgstr "ì??ì?? ì ?ì?¥"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "ë³´ì?´ê¸°"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "ì?¨ê¸°ê¸°"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "ë©?ì??ì§?ë¥¼ ë°?ì?? ì?¬ë??ì?? ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "ë©?ì??ì§?ì?? ì?¬ë³¸ì?? ë°?ì?? ì?¬ë??ì?? ì£¼ì??ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8308,97 +8139,84 @@ msgstr ""
 "ë©?ì??ì§?ì?? ë°?ë?? ì?¬ë?? ëª©ë¡?ì?? ë??í??ë??ì§? ì??ê³  ì°¸ì¡° ë©?ì??ì§?ë¥¼ ë°?ì?? ì£¼ì??ë¥¼ ì??ë ¥í??ì?ì??"
 "ì?¤."
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
 msgstr "ë³´ë?¸ ì?¬ë??(_O):"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "ë³´ë?¸ ì?¬ë??"
-
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:1014
 msgid "_Reply-To:"
 msgstr "í??ì?  ì£¼ì??(_R):"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:1018
 msgid "_To:"
 msgstr "ë°?ë?? ì?¬ë??(_T):"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
 msgstr "ì°¸ì¡°(_C):"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "ì°¸ì¡°"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
 msgstr "ì?¨ì?? ì°¸ì¡°(_B):"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "ì?¨ê¸´ ì°¸ì¡°"
-
 # post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
 msgstr "ê²?ì?? ì??ì¹?(_P):"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
 msgstr "ì ?ëª©(_U):"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
 msgid "Si_gnature:"
 msgstr "ì??ëª?(_G):"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "ì£¼ì??ë¡?ì?? ë³´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "ê²?ì??í?  í?´ë??ë¥¼ ê³ ë¥¼ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
 # tooltip
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "ë§?ì§?ë§? ë??ì??ì?? ì?¤í?? ì·¨ì??í?©ë??ë?¤"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "ë§?ì§?ë§? ì?¤í?? ì·¨ì??í?? ë??ì??ì?? ë?¤ì?? ì?¤í??í?©ë??ë?¤"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "í??ì?¤í?¸ ê²?ì??"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "í??ì?¤í?¸ ê²?ì?? ë°? ë°?ê¾¸ê¸°"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:317
 msgid "Save draft"
 msgstr "ì??ì?? ì ?ì?¥"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:197
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ ë?¤ì?? ë³´ì§? ì??ê¸°(_D)."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1030
+#, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "ë³´ë?´ë?? ë©?ì??ì§?ì?? ì??ëª?í?  ì?? ì??ì?µë??ë?¤: ê³?ì ?ì?? ì?¬ì?¸í?  ë?? ì?¸ ì?¸ì¦?ì??ë¥¼ ì?¤ì ?í??ì§? ì??"
 "ì??ì?µë??ë?¤"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1042
+#, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8406,21 +8224,19 @@ msgstr ""
 "ë³´ë?´ë?? ë©?ì??ì§?ë¥¼ ì??í?¸í??í?  ì?? ì??ì?µë??ë?¤: ê³?ì ?ì??ì?? ì??í?¸í?? ì?¸ì¦?ì??ë¥¼ ì?¤ì ?í??ì§? ì??ì??"
 "ì?µë??ë?¤"
 
-#: ../composer/e-msg-composer.c:1379
-msgid "Unable to reconstruct message from autosave file"
-msgstr "ì??ë?? ì ?ì?¥ í??ì?¼ì??ì?? ë©?ì??ì§?ë¥¼ ë?¤ì?? ë§?ë?¤ ì?? ì??ì?µë??ë?¤"
-
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1466 ../composer/e-msg-composer.c:1811
 msgid "Compose Message"
 msgstr "ë©?ì??ì§?ë¥¼ ì??ì?±í?©ë??ë?¤"
 
-#: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:3477
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
-"<b>(ë©?ì?¼ ì??ì?±ì?? í??ì?¤í?¸ê°? ì??ë?? ë©?ì??ì§? ë³¸ë¬¸ì?´ ë?¤ì?´ ì??ì?µë??ë?¤. ì?´ ë©?ì??ì§? ë³¸ë¬¸ì?? "
-"í?¸ì§?í?  ì?? ì??ì?µë??ë?¤.)</b>"
+"ë©?ì?¼ ì??ì?±ì?? í??ì?¤í?¸ê°? ì??ë?? ë©?ì??ì§? ë³¸ë¬¸ì?´ ë?¤ì?´ ì??ì?µë??ë?¤. ì?´ ë©?ì??ì§? ë³¸ë¬¸ì?? í?¸ì§?"
+"í?  ì?? ì??ì?µë??ë?¤."
+
+#: ../composer/e-msg-composer.c:4085
+msgid "Untitled Message"
+msgstr "ì ?ëª© ì??ë?? ë©?ì??ì§?"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8500,8 +8316,8 @@ msgstr ""
 "ì ?ë²?ì?? ì??ì?±í?? ë?°ì??ë¶?í?° ê³?ì?? ì??ì?±í?  ì?? ì??ì?µë??ë?¤."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "`{0}' í??ì?¼ì?? ì?¼ë°? í??ì?¼ì?´ ì??ë??ë¯?ë¡? ë©?ì??ì§?ì?? ì²¨ë¶?í?  ì?? ì??ì?µë??ë?¤."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "'{0}' í??ì?¼ì?? ì?¼ë°? í??ì?¼ì?´ ì??ë??ë¯?ë¡? ë©?ì??ì§?ì?? ì²¨ë¶?í?  ì?? ì??ì?µë??ë?¤."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
@@ -8519,8 +8335,8 @@ msgid "Unable to activate the address selector control."
 msgstr "ì£¼ì?? ì? í?? ì»¨í?¸ë¡¤ì?? í??ì?±í??í?  ì?? ì??ì?µë??ë?¤."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "`{0}' í??ì?¼ì?? ì?´ ë©?ì??ì§?ì?? ì²¨ë¶?í?  ì?? ì??ì?µë??ë?¤."
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "&quot;{0}&quot; í??ì?¼ì?? ì?´ ë©?ì??ì§?ì?? ì²¨ë¶?í?  ì?? ì??ì?µë??ë?¤."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8542,253 +8358,306 @@ msgstr "ë³µêµ¬(_R)"
 msgid "_Save Draft"
 msgstr "ì??ì?? ì ?ì?¥(_S)"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:198
 msgid "Run Anjal in a window"
 msgstr "ì?¤ì ?ì?¼ì?? ì°½ì?? ì?¤í??"
 
 # ì?µì?? ì?¤ëª?
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:199
 msgid "Make Anjal the default email client"
 msgstr "ì?¤ì ?ì?¼ì?? ê¸°ë³¸ ë©?ì?¼ í?´ë?¼ì?´ì?¸í?¸ë¡? ì?¬ì?©í?©ë??ë?¤"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:206
 msgid "ID of the socket to embed in"
 msgstr "í?¬í?¨í?  ì??ì¼?ì?? ID"
 
 # option argument
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:207
 msgid "socket"
 msgstr "<ì??ì¼?>"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:220
 msgid "Anjal email client"
 msgstr "ì?¤ì ?ì?¼ ë©?ì?¼ í??ë¡?ê·¸ë?¨"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "ì?? í?"
-
-#: ../capplet/settings/mail-account-view.c:56
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "ì ?ì²´ ì?´ë¦?ì?? ì??ë ¥í??ì?ì??ì?¤."
 
-#: ../capplet/settings/mail-account-view.c:57
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ ì??ë ¥í??ì?ì??ì?¤."
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "ì??ë ¥í?? ì ?ì??ë©?ì?¼ ì£¼ì??ê°? ì?¬ë°?ë¥´ì§? ì??ì?µë??ë?¤."
 
-#: ../capplet/settings/mail-account-view.c:224
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ê°?ì?¸ ì??ì?¸ ì ?ë³´:</span>"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤."
+
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "êµ¬ê¸?"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:464
+msgid "Personal details:"
+msgstr "ê°?ì?¸ ì??ì?¸ ì ?ë³´:"
+
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "ì?´ë¦?:"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "ì ?ì??ë©?ì?¼ ì£¼ì??:"
 
-#: ../capplet/settings/mail-account-view.c:248
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ë°?ê¸° ì ?ë³´:</span>"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "Details:"
+msgstr "ì??ì?¸í??:"
+
+# ì?¤ì ? tab, ì??í??ê°? ì??ë??
+#: ../capplet/settings/mail-account-view.c:498
+msgid "Receiving"
+msgstr "ë°?ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:505
 msgid "Server type:"
 msgstr "ì??ë²? ì¢?ë¥?:"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Server address:"
 msgstr "ì??ë²? ì£¼ì??:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:523
 msgid "Username:"
 msgstr "ì?¬ì?©ì??ì?´ë¦?:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:532
 msgid "Use encryption:"
 msgstr "ì??í?¸í?? ì?¬ì?©:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:537
+#: ../capplet/settings/mail-account-view.c:572
 msgid "never"
 msgstr "ì?¬ì?© ì?? í?¨"
 
-#: ../capplet/settings/mail-account-view.c:298
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ë³´ë?´ê¸° ì ?ë³´:</span>"
+# ì?¤ì ? tab, ì??í??ê°? ì??ë??
+#: ../capplet/settings/mail-account-view.c:549
+msgid "Sending"
+msgstr "ë³´ë?´ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:591
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
 "If we can't do it automatically you'll need your server details as well."
-msgstr "ì ?ì??ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?? ì?¬ì?©í??ë ¤ë©´ ê³?ì ?ì?? ì¤?ë¹?í?´ì?¼ í?©ë??ë?¤. ì??ë??ì?? ì ?ì??ë©?ì?¼ ì£¼ì??ì?? ì??í?¸ë¥¼ ì??ë ¥í??ë©´ ì??ë??ì?¼ë¡? í??ì??í?? ì?¤ì ?ì?? ë§?ë?ë??ë?¤. ì??ë??ì?¼ë¡? í?  ì?? ì??ë?? ê²½ì?°ì??ë?? ì??ë²? ì ?ë³´ë¥¼ ì§?ì ? ì??ë ¥í?´ì?¼ í?  ì??ë?? ì??ì?µë??ë?¤."
+msgstr ""
+"ì ?ì??ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?? ì?¬ì?©í??ë ¤ë©´ ê³?ì ?ì?? ì¤?ë¹?í?´ì?¼ í?©ë??ë?¤. ì??ë??ì?? ì ?ì??ë©?ì?¼ ì£¼ì??"
+"ì?? ì??í?¸ë¥¼ ì??ë ¥í??ë©´ ì??ë??ì?¼ë¡? í??ì??í?? ì?¤ì ?ì?? ë§?ë?ë??ë?¤. ì??ë??ì?¼ë¡? í?  ì?? ì??ë?? ê²½ì?°"
+"ì??ë?? ì??ë²? ì ?ë³´ë¥¼ ì§?ì ? ì??ë ¥í?´ì?¼ í?  ì??ë?? ì??ì?µë??ë?¤."
 
-#: ../capplet/settings/mail-account-view.c:357
+#: ../capplet/settings/mail-account-view.c:593
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
-msgstr "ì ?ì??ë©?ì?¼ ì?¤ì ?ì?? ì??ë??ì?¼ë¡? ë§?ë?¤ ì?? ì??ì?µë??ë?¤. ì??ë??ì?? ì?¤ì ?ì?? ì§?ì ? ì??ë ¥í??ì?ì??ì?¤. ì??ì??ì?? ì??ë ¥í?? ë?´ì?©ì?? ë?°ë?¼ ì?¼ë¶? ì?¤ì ?ì?´ ì±?ì??ì ¸ ì??ì§?ë§? ì?¤ì ?ì?? ë°?ê¿?ì?¼ ë??ì??í?©ë??ë?¤."
+msgstr ""
+"ì ?ì??ë©?ì?¼ ì?¤ì ?ì?? ì??ë??ì?¼ë¡? ë§?ë?¤ ì?? ì??ì?µë??ë?¤. ì??ë??ì?? ì?¤ì ?ì?? ì§?ì ? ì??ë ¥í??ì?ì??ì?¤. "
+"ì??ì??ì?? ì??ë ¥í?? ë?´ì?©ì?? ë?°ë?¼ ì?¼ë¶? ì?¤ì ?ì?´ ì±?ì??ì ¸ ì??ì§?ë§? ì?¤ì ?ì?? ë°?ê¿?ì?¼ ë??ì??í?©ë??ë?¤."
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:595
 msgid "You can specify more options to configure the account."
 msgstr "ê³?ì ?ì?? ì?¤ì ?í??ë ¤ë©´ ë?¤ë¥¸ ì?µì??ì?? ë?? ì§?ì ?í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:597
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
-msgstr "ì?´ì ? ë©?ì?¼ ë³´ë?´ê¸° ì?¤ì ?ì?´ í??ì??í?©ë??ë?¤. ì??ë??ì?¼ë¡? ì?¼ë¶? ì?¤ì ?ì?´ ì±?ì??ì ¸ ì??ì§?ë§?, ì?¬ë°?ë¥¸ì§? í??ì?¸í??ì?ì??ì?¤."
+msgstr ""
+"ì?´ì ? ë©?ì?¼ ë³´ë?´ê¸° ì?¤ì ?ì?´ í??ì??í?©ë??ë?¤. ì??ë??ì?¼ë¡? ì?¼ë¶? ì?¤ì ?ì?´ ì±?ì??ì ¸ ì??ì§?ë§?, ì?¬ë°?"
+"ë¥¸ì§? í??ì?¸í??ì?ì??ì?¤."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:598
 msgid "You can specify your default settings for your account."
 msgstr "ê³?ì ?ì?? ì?¤ì ? ê¸°ë³¸ê°?ì?? ì§?ì ?í?  ì?? ì??ì?µë??ë?¤."
 
 # assistantì??ì?? í??ì?¬ ì??í??
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:599
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
-msgstr "ì?´ì ? ì?¤ì ?ì?? í??ì?¸í??ì?ì??ì?¤. í??ì?¸ì?´ ë??ë??ë©´ ì??ë²?ì?? ì?°ê²°í?´ì?? ë©?ì?¼ì?? ê°?ì ¸ì?µë??ë?¤."
+msgstr ""
+"ì?´ì ? ì?¤ì ?ì?? í??ì?¸í??ì?ì??ì?¤. í??ì?¸ì?´ ë??ë??ë©´ ì??ë²?ì?? ì?°ê²°í?´ì?? ë©?ì?¼ì?? ê°?ì ¸ì?µë??ë?¤."
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:614
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
+#: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "ì? ì?? ì ?ë³´"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving mail"
 msgstr "ë?¤ì?? - ë©?ì?¼ ë°?ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving mail"
 msgstr "ë©?ì?¼ ë°?ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
 msgstr "ë?¤ì?? - ë©?ì?¼ ë³´ë?´ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Identity"
 msgstr "ë?¤ë¡? - ì? ì??"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Receiving options"
 msgstr "ë?¤ì?? - ë°?ê¸° ì?µì??"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Receiving options"
 msgstr "ë°?ê¸° ì?µì??"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving mail"
 msgstr "ë?¤ë¡? - ë©?ì?¼ ë°?ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Sending mail"
 msgstr "ë©?ì?¼ ë³´ë?´ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
 msgstr "ë?¤ì?? - ê³?ì ? ì ?ë³´ ê²?í? "
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Defaults"
 msgstr "ë?¤ë¡? - ê¸°ë³¸ê°?"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving options"
 msgstr "ë?¤ë¡? - ë°?ê¸° ì?µì??"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:619
+#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "ê¸°ë³¸ê°?"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Back - Sending mail"
 msgstr "ë?¤ë¡? - ë©?ì?¼ ë³´ë?´ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Review account"
 msgstr "ê³?ì ? ì ?ë³´ ê²?í? "
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Finish"
 msgstr "ë§?ì¹?ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Back - Sending"
 msgstr "ë?¤ë¡? - ë³´ë?´ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:726
+msgid "Setup Google contacts with Evolution"
+msgstr "êµ¬ê¸? ì?°ë?½ì²?ë¥¼ ì??ë³¼ë£¨ì??ì??ì?? ì?¤ì ?í?©ë??ë?¤."
+
+#: ../capplet/settings/mail-account-view.c:727
+msgid "Setup Google calendar with Evolution"
+msgstr "êµ¬ê¸? ë?¬ë ¥ì?? ì??ë³¼ë£¨ì??ì??ì?? ì?¤ì ?í?©ë??ë?¤."
+
+#: ../capplet/settings/mail-account-view.c:732
+msgid "You may need to enable IMAP access."
+msgstr "IMAP ì?°ê²°ì?? ì?¬ì?©í?´ì?¼ í?  ì??ë?? ì??ì?µë??ë?¤."
+
+#: ../capplet/settings/mail-account-view.c:740
+msgid "Google account settings:"
+msgstr "êµ¬ê¸? ê³?ì ? ì?¤ì ?:"
+
+#: ../capplet/settings/mail-account-view.c:767
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "ì?¼í?? ë?¬ë ¥ì?? ì??ë³¼ë£¨ì??ì??ì?? ì?¤ì ?í?©ë??ë?¤"
+
+#: ../capplet/settings/mail-account-view.c:771
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+"ì?¼í?? ë?¬ë ¥ì?? ì?´ë¦?ì?? \"ì?´ë¦?_ì?±\" í??ì??ì??ë??ë?¤. ë?¬ë ¥ ì?´ë¦?ì?? ë§?ë??ë ¤ê³  ì??ë??í??ì?µë??"
+"ë?¤. ë?¬ë ¥ ì?´ë¦?ì?? í??ì?¸í??ê³  ë§?ì§? ì??ì?¼ë©´ ë?¤ì?? ì??ë ¥í??ì?ì??ì?¤."
+
+#: ../capplet/settings/mail-account-view.c:778
+msgid "Yahoo account settings:"
+msgstr "ì?¼í?? ê³?ì ? ì?¤ì ?:"
+
+#: ../capplet/settings/mail-account-view.c:792
+msgid "Yahoo Calendar name:"
+msgstr "ì?¼í?? ë?¬ë ¥ ì?´ë¦?:"
+
+#: ../capplet/settings/mail-account-view.c:1061
+msgid "Password:"
+msgstr "ì??í?¸:"
+
+#: ../capplet/settings/mail-account-view.c:1129
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "í? ë?«ê¸°"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:1139
 msgid "Account Wizard"
 msgstr "ê³?ì ? ë§?ë²?ì?¬"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "ì??ë³¼ë£¨ì?? ê³?ì ? ë??ì?°ë¯¸"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "ì ?ì??ë©?ì?¼ ì?¤ì ?"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "ë??ë?´ê¸°"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../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:215
-#: ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1666
+#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
+#: ../modules/calendar/e-cal-shell-migrate.c:146
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "ì?´ ì»´í?¨í?°"
 
-#: ../capplet/settings/mail-settings-view.c:148
-#: ../plugins/groupwise-features/share-folder.c:747
-msgid "Modify"
-msgstr "ì??ì ?"
+#: ../capplet/settings/mail-settings-view.c:146
+#, c-format
+msgid "Modify %s..."
+msgstr "%s ì??ì ?..."
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "ì?? ê³?ì ? ì¶?ê°?"
 
-#: ../capplet/settings/mail-settings-view.c:185
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">ê³?ì ? ê´?ë¦¬</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "ê³?ì ? ê´?ë¦¬"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "ì?¤ì ?"
 
@@ -8800,8 +8669,8 @@ msgstr "ë?¬ë ¥ í??ì?¬ ì??ë¦¼"
 msgid "Evolution Alarm Notify"
 msgstr "ì??ë³¼ë£¨ì?? ì??ë¦¼"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "ì??ë³¼ë£¨ì??"
 
@@ -8821,47 +8690,43 @@ msgstr "ì ?ì??ë©?ì?¼, ì?°ë?½ì²?, ì?¼ì ?ì?? ê´?ë¦¬í?©ë??ë?¤"
 msgid "Configure email accounts"
 msgstr "ì ?ì??ë©?ì?¼ ê³?ì ? ì?¤ì ?"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "ì£¼ì?? ì¹´ë??"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "ë?¬ë ¥ ì ?ë³´"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "ì ?ì??ë©?ì?¼ ì?¤ì ?"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:228
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (ì·¨ì??í?¨)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:231
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (ì??ë£?)"
 
 #. Translators: This is an activity whose percent
 #. * complete is unknown.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:235
 #, c-format
 msgid "%s..."
 msgstr "%s..."
 
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:240
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ì??ë£?)"
 
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "ì??ë³¼ë£¨ì?? ì?¤ë¥?"
 
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "ì??ë³¼ë£¨ì?? ê²½ê³ "
 
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:659
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "ë?´ë¶? ì?¤ë¥?, ì?? ì?? ì??ë?? '%s' ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
@@ -8922,56 +8787,64 @@ msgstr "ì??ë¶? ì? ë?½ì?´"
 msgid "Western European, New"
 msgstr "ì??ë¶? ì? ë?½ì?´, ì??ë¡?ì?´ ì?¸ì½?ë?©"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "ë²?ì²´"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "ê°?ì²´"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "ì?°í?¬ë?¼ì?´ë??ì?´"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "ë¹?ì£¼ì?¼"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "ì?¤ë??"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "ë?´ì?¼"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "ì?´ì ?"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "%dì?¼ í??"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "%dì?¼ í??"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "%dì?¼ ì ?"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%dì?¼ ì ?"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "ë¡?ìº? ê¸°ë³¸ê°? ì?¬ì?©"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "í??ì??:"
 
@@ -8993,18 +8866,6 @@ msgstr "\"%s\" ì?°ë?? ì¤?"
 msgid "Writing \"%s\" to %s"
 msgstr "\"%s\" í??ì?¼ì?? %s ì??ì¹?ì?? ì?°ë?? ì¤?"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "ê¸°ë¡? í??ë¡?ê·¸ë?¨ì?? ì?´ë¦?"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "í??ì?¼ ì?´ë¦?"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "ëª¨ë??ì?? í??ì?¼ ì?´ë¦?"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "ë??ë²?ê¹? ê¸°ë¡?"
@@ -9027,13 +8888,15 @@ msgstr "ê¸°ë¡? ë©?ì??ì§?:"
 msgid "Log Level"
 msgstr "ê¸°ë¡? ë?¨ê³?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ë©?ì??ì§?"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1433
+#: ../shell/e-shell-window-actions.c:1440
 msgid "Close this window"
 msgstr "ì?´ ì°½ì?? ë?«ì?µë??ë?¤"
 
@@ -9057,41 +8920,30 @@ msgstr "ë??ë²?ê¹?"
 msgid "Error, Warnings and Debug messages"
 msgstr "ì?¤ë¥?, ê²½ê³  ë°? ë??ë²?ê¹? ë©?ì??ì§?"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "ì?¬ì?©"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í??ë??ì§? ì?¬ë¶?"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "ì£¼"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "ì?¸ì??í??ë?? ë??ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "ì?¸ì?? ì??ì?¤í??ì??ì?? ë?¤ì??ê³¼ ê°?ì?? ì?¤ë¥?ê°? ë³´ê³ ë??ì??ì?µë??ë?¤:"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "ì?¸ì?? ì??ì?¤í??ì??ì?? ì¶?ê°? ì?¤ë¥? ë?´ì?©ì?? ì??ì?¸í?? ë³´ê³ í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../e-util/e-signature.c:701
+#: ../e-util/e-signature.c:707
 msgid "Autogenerated"
 msgstr "ì??ë??ì?¼ë¡? ë§?ë?¤ê¸°"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "\"{1}\" ë??ë¬¸ì??ë??ë?¤."
 
@@ -9111,15 +8963,15 @@ msgstr "ë?®ì?´ ì?°ì??ê² ì?µë??ê¹??"
 msgid "File exists \"{0}\"."
 msgstr "\"{0}\" í??ì?¼ì?´ ì??ì?µë??ë?¤."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
 msgid "_Overwrite"
 msgstr "ë?®ì?´ ì?°ê¸°(_O)"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "ë§?í?¬ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "ì??ë³¼ë£¨ì?? ë??ì??ë§?ì?? í??ì??í?  ì?? ì??ì?µë??ë?¤."
 
@@ -9132,266 +8984,280 @@ msgstr "GConf ì?¤ë¥?: %s"
 msgid "All further errors shown only on terminal."
 msgstr "ë??ë¨¸ì§? ì?¤ë¥? ë©?ì??ì§?ë?? í?°ë¯¸ë??ì??ì??ë§? í??ì??í?©ë??ë?¤."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1038
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:72
+msgid "From"
+msgstr "ë³´ë?¸ ì?¬ë??"
+
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "í??ì?  ì£¼ì??"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
+#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
+#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "ì°¸ì¡°"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
+#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
+#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "ì?¨ì?? ì°¸ì¡°"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1043
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "ì ?ëª©"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
+#: ../modules/mail/em-mailer-prefs.c:1120
 msgid "Mailer"
 msgstr "ë©?ì?¼ í??ë¡?ê·¸ë?¨"
 
 # ë²?ì?ì?? ì ?í?©í??ì§? ì??ë?¤.
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1296
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
+#: ../widgets/misc/e-dateedit.c:549
 msgid "Date"
 msgstr "ë? ì§?"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "ë?´ì?¤ê·¸ë£¹"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1046 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ì?¼êµ´"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1431
 #, c-format
 msgid "%s attachment"
 msgstr "%s ì²¨ë¶?"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1503
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤: ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1662 ../em-format/em-format.c:1846
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤. ì??ì?¤ë¡? ë³´ì?¬ì¤?ë??ë?¤."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1672
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "multipart/encryptedì?? ì§?ì??í??ì§? ì??ë?? ì??í?¸í?? ë°©ì??ì?? ì?¬ì?©í??ì?µë??ë?¤"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1688
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1689
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤: ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1871
 msgid "Unsupported signature format"
 msgstr "ì§?ì??í??ì§? ì??ë?? ì??ëª? í??ì??ì??ë??ë?¤"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
 msgid "Error verifying signature"
 msgstr "ì??ëª?ì?? í??ì?¸í??ë?? ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
+#: ../em-format/em-format.c:2042
 msgid "Unknown error verifying signature"
 msgstr "ì??ëª?ì?? í??ì?¸í??ë?? ì¤? ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message"
-msgstr "PGP ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤."
+#: ../em-format/em-format.c:2129
+msgid "Could not parse PGP message: "
+msgstr "PGP ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤:"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message: Unknown error"
-msgstr "PGP ë©?ì??ì§?ë¥¼ ë¶?ì??í?  ì?? ì??ì?µë??ë?¤: ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
+#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%dì´? ì ?"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "ì??ì?¼ë¡? %dì´?"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%dë¶? ì ?"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "ì??ì?¼ë¡? %dë¶?"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%dì??ê°? ì ?"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "ì??ì?¼ë¡? %dì??ê°?"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%dì?¼ ì ?"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "ì??ì?¼ë¡? %dì?¼"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%dì£¼ ì ?"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "ì??ì?¼ë¡? %dì£¼"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%dë?¬ ì ?"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "ì??ì?¼ë¡? %dë?¬"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%dë?? ì ?"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "ì??ì?¼ë¡? %dë??"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:122
 msgid "<click here to select a date>"
 msgstr "<ë? ì§?ë¥¼ ì? í??í??ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:125 ../filter/e-filter-datespec.c:136
+#: ../filter/e-filter-datespec.c:147
 msgid "now"
 msgstr "í??ì?¬"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:132
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:275
 msgid "Select a time to compare against"
 msgstr "ë¹?êµ?í?  ì??ê°?ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "í??ì?¼ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:663
 msgid "R_ule name:"
 msgstr "ê·?ì¹? ì?´ë¦?(_U):"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:693
 msgid "Find items that meet the following conditions"
 msgstr "ë?¤ì?? ì¡°ê±´ì?´ ë§?ì¡±í??ë?? í?ëª©ì?? ì°¾ì?µë??ë?¤"
 
-#: ../filter/e-filter-rule.c:723
-msgid "A_dd Condition"
-msgstr "ì¡°ê±´ ì¶?ê°?(_D)"
-
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:718
 msgid "If all conditions are met"
 msgstr "ëª¨ë?  ì¡°ê±´ì?´ ë?¤ ì¶©ì¡±ë??ë©´"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:719
 msgid "If any conditions are met"
 msgstr "ì?´ë?¤ ì¡°ê±´ì?´ë?¼ë?? ì¶©ì¡±ë??ë©´"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:722
 msgid "_Find items:"
 msgstr "í?ëª© ì°¾ê¸°(_F):"
 
-#: ../filter/e-filter-rule.c:760
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:749
+msgid "None"
+msgstr "ì??ì??"
+
+#: ../filter/e-filter-rule.c:750
 msgid "All related"
 msgstr "ê´?ê³?ë?? ëª¨ë??"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
-msgstr "ë?µì?¥"
+msgstr "í??ì? "
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:752
 msgid "Replies and parents"
-msgstr "ë?µì?¥ ë°? ê·¸ ì??ì?? ë©?ì?¼"
+msgstr "í??ì?  ë°? ê·¸ ì??ì?? ë©?ì?¼"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:753
 msgid "No reply or parent"
-msgstr "ë?µì?¥ ì??ê±°ë?? ì??ì?? ë©?ì?¼ ì??ì??"
+msgstr "í??ì?  ì??ê±°ë?? ì??ì?? ë©?ì?¼ ì??ì??"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:756
 msgid "I_nclude threads"
 msgstr "ê¸?í??ë?? í?¬í?¨(_N)"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../filter/e-filter-rule.c:779
+msgid "A_dd Condition"
+msgstr "ì¡°ê±´ ì¶?ê°?(_D)"
+
+#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "ë°?ë?? ë©?ì?¼"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "ë³´ë?´ë?? ë©?ì?¼"
 
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "ê·?ì¹? ì¶?ê°?"
 
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "ê·?ì¹? í?¸ì§?"
 
@@ -9415,7 +9281,7 @@ msgstr "ë? ì§?ê°? ë¹ ì¡?ì?µë??ë?¤."
 msgid "Missing file name."
 msgstr "í??ì?¼ ì?´ë¦?ì?´ ë¹ ì¡?ì?µë??ë?¤."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "ì?´ë¦?ì?´ ë¹ ì¡?ì?µë??ë?¤."
 
@@ -9471,7 +9337,7 @@ msgstr ""
 "í??í?°ë§?í??ë?? í??ì?¬ ì??ê°?ì?? ê¸°ì¤?ì?¼ë¡?\n"
 "ë©?ì??ì§? ì??ê°?ì?? ë¹?êµ?í?©ë??ë?¤."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "í??í?° ê·?ì¹?(_F)"
 
@@ -9492,7 +9358,7 @@ msgstr "ì??ì?¼ë¡?"
 msgid "months"
 msgstr "ë?¬"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
 msgid "seconds"
 msgstr "ì´?"
 
@@ -9508,43 +9374,27 @@ msgstr "ì§?ì ?í??ë?? ì??ê°?"
 msgid "years"
 msgstr "ì?°ë??"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
+#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
+#: ../widgets/misc/e-attachment-paned.c:134
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "ì²¨ë¶?"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:611
+#: ../widgets/misc/e-attachment-paned.c:599
 msgid "Icon View"
 msgstr "ì??ì?´ì½? ë³´ê¸°"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:612
+#: ../widgets/misc/e-attachment-paned.c:600
 msgid "List View"
 msgstr "ëª©ë¡? ë³´ê¸°"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "í?¬ì»¤ì?¤ ì¶?ì ?"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "ì?¸ ëª¨ë??"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "ë©?ì?¼ ì?¸ ë°±ì??ë??"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "ì?ì ?í?? ë©?ì??ì§? ë³´ê¸°"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "ì?ì ?í?? ë©?ì??ì§? ë³´ê¸°"
+#: ../mail/e-mail-browser.c:265
+msgid "(No Subject)"
+msgstr "(ì ?ëª© ì??ì??)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9562,7 +9412,7 @@ msgstr "ì?´ ì£¼ì??ì??ì??(_F)"
 msgid "Create Search _Folder"
 msgstr "ê²?ì?? í?´ë?? ë§?ë?¤ê¸°(_F)"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "ë ?ì?´ë¸? ì?´ë¦?(_L):"
 
@@ -9591,7 +9441,7 @@ msgid "_Later"
 msgstr "ë??ì¤?ì??(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:505
 msgid "Add Label"
 msgstr "ë ?ì?´ë¸? ì¶?ê°?"
 
@@ -9611,115 +9461,57 @@ msgstr ""
 msgid "Color"
 msgstr "ì??"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:334
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "ì?´ë¦?"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2761
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "ë°?ì?? í?¸ì§?í?¨"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
 msgid "Drafts"
 msgstr "ì??ì?? ë³´ê´?í?¨"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
 msgid "Outbox"
 msgstr "ë³´ë?¼ í?¸ì§?í?¨"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
 msgid "Sent"
 msgstr "ë³´ë?¸ í?¸ì§?í?¨"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:578
 msgid "Templates"
 msgstr "ì??ì??"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "ì¤?ì??"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "í?  ì?¼"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "ë??ì¤?ì??"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "ì?®ê¸°ë?? ì¤?..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "ì?®ê¸°ê¸°"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "'%s' ì?®ê¸°ë?? ì¤?:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "`%s' í?´ë??ë¥¼ ì??ë¡? ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "`%s' í?´ë??ë¥¼ `%s' í?´ë??ë¡? ë³µì?¬í?  ì?? ì??ì?µë??ë?¤: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "`%s'ì?? ì??ë?? ë©?ì?¼í?¨ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤: %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
 msgstr "í?´ë??ë¥¼ ì?®ê¸°ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ì??ë³¼ë£¨ì?? ë©?ì?¼í?¨ í?´ë??ì?? ì??ì¹?ì?? êµ¬ì¡°ê°? ì??ë³¼ë£¨ì?? 1.xì?? ë?¤ë¥´ê²? ë°?ë??ì??ì?µë??ë?¤.\n"
-"\n"
-"í?´ë??ë¥¼ ì?®ê¸°ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "ê³¼ê±°ì?? POP keep-on-server ë?°ì?´í?° `%s'ì??(ë¥¼) ì?´ ì?? ì??ì?µë??ë?¤: %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"POP keep-on-server ë?°ì?´í?° ë??ë ?í?°ë¦¬ `%s' ë??ë ?í?°ë¦¬ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "POP3 keep-on-server ë?°ì?´í?° `%s'ì??(ë¥¼) ë³µì?¬í?  ì?? ì??ì?µë??ë?¤: %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "`%s' ë¡?ì»¬ ë©?ì?¼ ì ?ì?¥ê³ ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:650
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9731,46 +9523,52 @@ msgstr ""
 "\n"
 "í?´ë??ë¥¼ ì?®ê¸°ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:796
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "`%s'ì?? ë¡?ì»¬ ë©?ì?¼ í?´ë??ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "'%s'ì?? ë¡?ì»¬ ë©?ì?¼ í?´ë??ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"ì?´ì ?ì?? ì?¤ì¹?í?? ì??ë³¼ë£¨ì??ì??ì?? ì?¤ì ?ì?? ì??ì?´ë?¤ì?¼ ì?? ì??ì?µë??ë?¤. `evolution/config."
-"xmldb'ê°? ì??ê±°ë?? ë§?ê°?ì¡?ì?µë??ë?¤."
+#: ../mail/e-mail-notebook-view.c:563
+msgid "Please select a folder"
+msgstr "í?´ë??ë¥¼ ì? í??í??ì?ì??ì?¤"
 
 # ì£¼ì??: check buttonì?? ì?¬ì?©. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "ë?¤ì?? ë¬»ì§? ì??ê¸°"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "í?´ë??ë¡? ë³µì?¬"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "ë³µì?¬(_O)"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "í?´ë??ë¡? ì?´ë??"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "ì?´ë??(_M)"
 
-#: ../mail/e-mail-reader.c:864
+# ì£¼ì??: check buttonì?? ì?¬ì?©. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?
+#. Check buttons
+#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
+#: ../mail/e-mail-reader.c:1111
+msgid "_Do not ask me again."
+msgstr "ë?¤ì?? ë¬»ì§? ì??ê¸°(_D)"
+
+#: ../mail/e-mail-reader.c:1116
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ê²½ì?° Reply-To: ë¬´ì??(_A)"
+
+#: ../mail/e-mail-reader.c:1206
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ë©?ì??ì§? ì ?ì?¥"
@@ -9781,629 +9579,678 @@ msgstr[0] "ë©?ì??ì§? ì ?ì?¥"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:1227
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ë©?ì??ì§?"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1492
 msgid "A_dd Sender to Address Book"
 msgstr "ë³´ë?¸ ì?¬ë??ì?? ì£¼ì??ë¡?ì?? ì¶?ê°?(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1494
 msgid "Add sender to address book"
 msgstr "ë³´ë?¸ ì?¬ë??ì?? ì£¼ì??ë¡?ì?? ì¶?ê°?í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1499
 msgid "Check for _Junk"
 msgstr "ì ?í?¬ë©?ì?¼ ê²?ì?¬(_J)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1501
 msgid "Filter the selected messages for junk status"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì ?í?¬ë©?ì?¼ì?¸ì§? í??í?°ë§?í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1506
 msgid "_Copy to Folder..."
 msgstr "í?´ë??ë¡? ë³µì?¬(_C)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1508
 msgid "Copy selected messages to another folder"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ë?¤ë¥¸ í?´ë??ë¡? ë³µì?¬í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1513
 msgid "_Delete Message"
 msgstr "ë©?ì??ì§? ì?ì ?(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1515
 msgid "Mark the selected messages for deletion"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì§?ì?´ ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1520
 msgid "Filter on Mailing _List..."
 msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??ë??í?? í??í?°(_L)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1522
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ì?´ ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??ê²? ë³´ë?¸ ë©?ì??ì§?ë¥¼ í??í?° ê·?ì¹?ì?¼ë¡? ë§?ë?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1527
 msgid "Filter on _Recipients..."
 msgstr "ë°?ë?? ì?¬ë??ì?? ë??í?? í??í?°(_R)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1529
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ì?´ ë°?ë?? ì?¬ë??ì??ê²? ë³´ë?¸ ë©?ì??ì§?ë¥¼ í??í?° ê·?ì¹?ì?¼ë¡? ë§?ë?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1534
 msgid "Filter on Se_nder..."
 msgstr "ë³´ë?¸ ì?¬ë??ì?? ë??í?? í??í?°(_N)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1536
 msgid "Create a rule to filter messages from this sender"
 msgstr "ì?´ ë³´ë?¸ ì?¬ë??ì?´ ë³´ë?¸ ë©?ì??ì§?ë¥¼ í??í?° ê·?ì¹?ì?¼ë¡? ë§?ë?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1541
 msgid "Filter on _Subject..."
 msgstr "ì ?ëª©ì?? ë??í?? í??í?°(_S)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1543
 msgid "Create a rule to filter messages with this subject"
 msgstr "ì?´ ì ?ëª©ì?¼ë¡? ë??ì°©í?? ë©?ì??ì§?ë¥¼ í??í?° ê·?ì¹?ì?¼ë¡? ë§?ë?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1548
 msgid "A_pply Filters"
 msgstr "í??í?° ì ?ì?©(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1550
 msgid "Apply filter rules to the selected messages"
 msgstr "ì? í??í?? ë©?ì??ì§?ì?? í??í?° ê·?ì¹?ì?? ì ?ì?©í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1555
 msgid "_Find in Message..."
 msgstr "ë©?ì??ì§?ì??ì?? ì°¾ê¸°(_F)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1557
 msgid "Search for text in the body of the displayed message"
 msgstr "í??ì??í?? ë©?ì??ì§?ì?? ë³¸ë¬¸ì??ì?? í??ì?¤í?¸ë¥¼ ì°¾ì?µë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1562
 msgid "_Clear Flag"
 msgstr "í??ë??ê·¸ ì§?ì?°ê¸°(_C)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1564
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "ì? í??í?? ë©?ì??ì§?ì??ì?? ì¶?ê°? ì??ì?? í??ë??ê·¸ë¥¼ ì§?ì??ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1569
 msgid "_Flag Completed"
 msgstr "í??ë??ê·¸ ì??ë£?(_F)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1571
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ì? í??í?? ë©?ì??ì§?ì?? ì¶?ê°? ì??ì??ì?? ë§?ì¹¨ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1576
 msgid "Follow _Up..."
 msgstr "ì¶?ê°? ì??ì??(_U)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1578
 msgid "Flag the selected messages for follow-up"
 msgstr "ì? í??í?? ë©?ì??ì§?ì?? ì¶?ê°? ì??ì??ì?? í??ì??í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1583
 msgid "_Attached"
 msgstr "ì²¨ë¶?(_A)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ë?¤ë¥¸ ì?¬ë??ì??ê²? ì²¨ë¶?í??ì?¬ ì ?ë?¬í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1590
 msgid "Forward As _Attached"
 msgstr "ì²¨ë¶?ë¡? ì ?ë?¬(_A)"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1597
 msgid "_Inline"
 msgstr "í?¬í?¨(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
 msgid "Forward the selected message in the body of a new message"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì?? ë©?ì??ì§?ì?? ë³¸ë¬¸ì?¼ë¡? ì ?ë?¬í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1604
 msgid "Forward As _Inline"
 msgstr "í?¬í?¨í?´ì?? ì ?ë?¬(_I)"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1611
 msgid "_Quoted"
 msgstr "ì?¸ì?©(_Q)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
 msgid "Forward the selected message quoted like a reply"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ í??ì? ì²?ë?¼ ì?¸ì?©í??ì?¬ ì ?ë?¬í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1618
 msgid "Forward As _Quoted"
 msgstr "ì?¸ì?©í?´ì?? ì ?ë?¬(_Q)"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1625
 msgid "_Load Images"
 msgstr "ê·¸ë¦¼ ì?½ì?´ë?¤ì?´ê¸°(_L)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1627
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML ë©?ì?¼ì?? ê·¸ë¦¼ì?? ê°?ì ?ë¡? ì?½ì?´ë?¤ì??ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1632
 msgid "_Important"
 msgstr "ì¤?ì??(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1634
 msgid "Mark the selected messages as important"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì¤?ì??í?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1639
 msgid "_Junk"
 msgstr "ì ?í?¬ë©?ì?¼(_J)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1641
 msgid "Mark the selected messages as junk"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì ?í?¬ë©?ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1646
 msgid "_Not Junk"
 msgstr "ì ?í?¬ë©?ì?¼ ì??ë??(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1648
 msgid "Mark the selected messages as not being junk"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì ?í?¬ë©?ì?¼ì?´ ì??ë?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1653
 msgid "_Read"
 msgstr "ì?½ê¸°(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1655
 msgid "Mark the selected messages as having been read"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1660
 msgid "Uni_mportant"
 msgstr "ì¤?ì??í??ì§? ì??ì??(_M)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1662
 msgid "Mark the selected messages as unimportant"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì¤?ì??í??ì§? ì??ì?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1667
 msgid "_Unread"
 msgstr "ì?½ê¸° ì·¨ì??(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1669
 msgid "Mark the selected messages as not having been read"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì?½ì§? ì??ì?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1674
 msgid "_Edit as New Message..."
 msgstr "ì?? ë©?ì??ì§?ë¡? í?¸ì§?(_E)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1676
 msgid "Open the selected messages in the composer for editing"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ë©?ì?¼ ì??ì?±ì??ì?? ì?´ì?´ì?? í?¸ì§?í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1681
 msgid "Compose _New Message"
 msgstr "ì?? ë©?ì??ì§? ì??ì?±(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1683
 msgid "Open a window for composing a mail message"
 msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ì??ì?±í??ë?? ì°½ì?? ì?½ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1688
 msgid "_Open in New Window"
 msgstr "ì?? ì°½ì??ì?? ì?´ê¸°(_O)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1690
 msgid "Open the selected messages in a new window"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì?? ì°½ì??ì?? ì?½ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1695
 msgid "_Move to Folder..."
 msgstr "í?´ë??ë¡? ì?´ë??(_M)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1697
 msgid "Move selected messages to another folder"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ë?¤ë¥¸ í?´ë??ë¡? ì?®ê¹?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1702
+msgid "_Switch to Folder"
+msgstr "í?´ë??ë¡? ì?´ë??(_S)"
+
+#: ../mail/e-mail-reader.c:1704
+msgid "Display the parent folder"
+msgstr "ì??ì?? í?´ë?? í??ì??"
+
+#: ../mail/e-mail-reader.c:1709
+msgid "Switch to _next tab"
+msgstr "ë?¤ì?? í?ì?¼ë¡? ì?´ë??(_N)"
+
+#: ../mail/e-mail-reader.c:1711
+msgid "Switch to the next tab"
+msgstr "ë?¤ì?? í?ì?¼ë¡? ì?´ë??í?©ë??ë?¤"
+
+#: ../mail/e-mail-reader.c:1716
+msgid "Switch to _previous tab"
+msgstr "ì?´ì ? í?ì?¼ë¡? ì?´ë??(_P)"
+
+#: ../mail/e-mail-reader.c:1718
+msgid "Switch to the previous tab"
+msgstr "ì?´ì ? í?ì?¼ë¡? ì?´ë??í?©ë??ë?¤"
+
+#: ../mail/e-mail-reader.c:1723
+msgid "Cl_ose current tab"
+msgstr "í??ì?¬ í? ë?«ê¸°(_O)"
+
+#: ../mail/e-mail-reader.c:1725
+msgid "Close current tab"
+msgstr "í??ì?¬ í?ì?? ë?«ì?µë??ë?¤"
+
+#: ../mail/e-mail-reader.c:1730
 msgid "_Next Message"
 msgstr "ë?¤ì?? ë©?ì??ì§?(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1732
 msgid "Display the next message"
 msgstr "ë?¤ì??ì?? ë©?ì??ì§?ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1737
 msgid "Next _Important Message"
 msgstr "ë?¤ì?? ì¤?ì??í?? ë©?ì??ì§?(_I)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1739
 msgid "Display the next important message"
 msgstr "ë?¤ì??ì?? ì¤?ì??í?? ë©?ì??ì§?ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1744
 msgid "Next _Thread"
 msgstr "ë?¤ì?? ê¸?í??ë??(_T)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1746
 msgid "Display the next thread"
 msgstr "ë?¤ì??ì?? ê¸?í??ë??ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
 # ì£¼ì??: ì??ë??ì?? Previous Unread Messageì?? ê°?ì?? í??í??ë¡? ë²?ì?
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1751
 msgid "Next _Unread Message"
 msgstr "ì?½ì§? ì??ì?? ë?¤ì?? ë©?ì??ì§?(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1753
 msgid "Display the next unread message"
 msgstr "ë?¤ì??ì?? ì?½ì§? ì??ì?? ë©?ì??ì§?ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1758
 msgid "_Previous Message"
 msgstr "ì?´ì ? ë©?ì??ì§?(_P)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1760
 msgid "Display the previous message"
 msgstr "ì?´ì ?ì?? ë©?ì??ì§?ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1765
 msgid "Pr_evious Important Message"
 msgstr "ì?´ì ?ì?? ì¤?ì??í?? ë©?ì??ì§?(_E)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1767
 msgid "Display the previous important message"
 msgstr "ì?´ì ?ì?? ì¤?ì??í?? ë©?ì??ì§?ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
 # ì£¼ì??: ì??ì?? Next Unread Messageì?? ê°?ì?? í??í??ë¡? ë²?ì?
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1772
 msgid "P_revious Unread Message"
 msgstr "ì?½ì§? ì??ì?? ì?´ì ? ë©?ì??ì§?(_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1774
 msgid "Display the previous unread message"
 msgstr "ì?´ì ?ì?? ì?½ì§? ì??ì?? ë©?ì??ì§?ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1781
 msgid "Print this message"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ ì?¸ì??í?©ë??ë?¤"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1788
 msgid "Preview the message to be printed"
-msgstr "ì?¸ì??í?  ë©?ì??ì§?ë¥¼ ë¯¸ë¦¬ë´?ë??ë?¤"
+msgstr "ì?¸ì??í?  ë©?ì??ì§?ë¥¼ ë¯¸ë¦¬ ë´?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1793
 msgid "Re_direct"
 msgstr "ì??ì? ë§? ë³?ê²½(_D)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1795
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "ì? í??í?? ë©?ì??ì§?ì?? ì??ì? ì??ë¥¼ ë??êµ°ê°?ë¡? ë³?ê²½í?©ë??ë?¤ (ë°?ì?¡í?©ë??ë?¤)"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "ì ?ì²´ì?? í??ì? (_A)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1802
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "ì? í??í?? ë©?ì??ì§?ì?? ë°?ë?? ì?¬ë?? ëª¨ë??ì??ê²? í??ì? ì?? ì??ì?±í?©ë??ë?¤"
 
 # Listë?? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ë¥¼ ë§?í?¨.
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1807 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "ë¦¬ì?¤í?¸ì?? í??ì? (_L)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1809
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "ì? í??í?? ë©?ì??ì§?ì?? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ë¡? í??ì? ì?? ì??ì?±í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1814
+#: ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "ë³´ë?¸ ì?¬ë??ì??ê²? í??ì? (_R)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1816
 msgid "Compose a reply to the sender of the selected message"
 msgstr "ì?´ ë©?ì??ì§?ë¥¼ ë³´ë?¸ì?¬ë??ì??ê²? í??ì? ì?? ì??ì?±í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1821
 msgid "_Save as mbox..."
 msgstr "ë©?ì?¼í?¨ì?¼ë¡? ì ?ì?¥(_S)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1823
 msgid "Save selected messages as an mbox file"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ë©?ì?¼í?¨ (mbox) í??ì?¼ë¡? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1828
 msgid "Search Folder from Mailing _List..."
 msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ë??í?? ê²?ì?? í?´ë??(_L)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1830
 msgid "Create a search folder for this mailing list"
 msgstr "ì?´ ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ë??í?? ê²?ì?? í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1835
 msgid "Search Folder from Recipien_ts..."
 msgstr "ë°?ë?? ì?¬ë??ì?? ë??í?? ê²?ì?? í?´ë??(_T)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1837
 msgid "Create a search folder for these recipients"
 msgstr "ì?´ ë°?ë?? ì?¬ë??ì?? ë??í?? ê²?ì?? í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1842
 msgid "Search Folder from Sen_der..."
 msgstr "ë³´ë?¸ ì?¬ë??ì?? ë??í?? ê²?ì?? í?´ë??(_D)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1844
 msgid "Create a search folder for this sender"
 msgstr "ì?´ ë³´ë?¸ ì?¬ë??ì?? ë??í?? ê²?ì?? í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1849
 msgid "Search Folder from S_ubject..."
 msgstr "ì ?ëª©ì?? ë??í?? ê²?ì?? í?´ë??(_U)..."
 
 # tooltip
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1851
 msgid "Create a search folder for this subject"
 msgstr "ì?´ ì ?ëª©ì?? ë??í?? ê²?ì?? í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1856
 msgid "_Message Source"
 msgstr "ë©?ì??ì§? ì??ë³¸(_M)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1858
 msgid "Show the raw email source of the message"
 msgstr "ë©?ì??ì§?ì?? ë©?ì?¼ ì??ì?¤ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1870
 msgid "_Undelete Message"
 msgstr "ë©?ì??ì§? ë??ì?´ë¦¬ê¸°(_U)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1872
 msgid "Undelete the selected messages"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ë??ì?´ë¦½ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1877
 msgid "_Normal Size"
 msgstr "ë³´í?µ í?¬ê¸°(_N)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1879
 msgid "Reset the text to its original size"
 msgstr "ê¸?ì??ë¥¼ ì??ë?? í?¬ê¸°ë¡? ë§?ì¶¥ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1884
 msgid "_Zoom In"
 msgstr "í??ë??(_Z)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1886
 msgid "Increase the text size"
 msgstr "ê¸?ì?? í?¬ê¸°ë¥¼ í?¤ì??ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1891
 msgid "Zoom _Out"
 msgstr "ì¶?ì??(_O)"
 
 # tooltip
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1893
 msgid "Decrease the text size"
 msgstr "ê¸?ì?? í?¬ê¸°ë¥¼ ì¤?ì??ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1900
 msgid "Create R_ule"
 msgstr "ê·?ì¹? ë§?ë?¤ê¸°(_U)"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1907
 msgid "Ch_aracter Encoding"
 msgstr "ë¬¸ì?? ì?¸ì½?ë?©(_A)"
 
 # inline, attached, quoted ë?°ì??
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1914
 msgid "F_orward As"
 msgstr "ì ?ë?¬ ë°©ì??(_O)"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1921
+msgid "_Group Reply"
+msgstr "ê·¸ë£¹ í??ì? (_G)"
+
+#: ../mail/e-mail-reader.c:1928
 msgid "_Go To"
 msgstr "ì?´ë??(_G)"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1935
 msgid "Mar_k As"
 msgstr "í??ì??(_K)"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1942
 msgid "_Message"
 msgstr "ë©?ì??ì§?(_M)"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1949
 msgid "_Zoom"
 msgstr "í??ë??/ì¶?ì??(_Z)"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1974
 msgid "Mark for Follo_w Up..."
 msgstr "ì¶?ê°? ì??ì??ì?¼ë¡? í??ì??(_W)..."
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1982
 msgid "Mark as _Important"
 msgstr "ì¤?ì??í?? ê²?ì?¼ë¡? í??ì??(_I)"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1986
 msgid "Mark as _Junk"
 msgstr "ì ?í?¬ë©?ì?¼ë¡? í??ì??(_J)"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1990
 msgid "Mark as _Not Junk"
 msgstr "ì ?í?¬ë©?ì?¼ì?´ ì??ë?? ê²?ì?¼ë¡? í??ì??(_N)"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1994
 msgid "Mar_k as Read"
 msgstr "ì?½ì?? ê²?ì?¼ë¡? í??ì??(_K)"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1998
 msgid "Mark as Uni_mportant"
 msgstr "ì¤?ì??í??ì§? ì??ì?? ê²?ì?¼ë¡? í??ì??(_M)"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark as _Unread"
 msgstr "ì?½ì§? ì??ì?? ê²?ì?¼ë¡? í??ì??(_U)"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:2038
 msgid "_Caret Mode"
 msgstr "ìº?ë¦¿ ëª¨ë??(_C)"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:2040
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "í??ì??í??ë?? ë©?ì??ì§?ì?? ë³¸ë¬¸ ì??ì?? ê¹?ë°?ì?´ë?? ì»¤ì??ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:2046
 msgid "All Message _Headers"
 msgstr "ëª¨ë?  ë©?ì??ì§? í?¤ë??(_H)"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:2048
 msgid "Show messages with all email headers"
 msgstr "ë©?ì?¼ì?? ëª¨ë?  í?¤ë??ì?? í?¨ê»? ë©?ì??ì§?ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:2269
 msgid "Unable to retrieve message"
 msgstr "ë©?ì??ì§?ë¥¼ ê°?ì ¸ì?¬ ì?? ì??ì?µë??ë?¤"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
 #, 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:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
-#: ../widgets/misc/e-account-tree-view.c:234
+#: ../mail/e-mail-reader.c:2893 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
+#: ../widgets/misc/e-account-tree-view.c:240
 msgid "Default"
 msgstr "ê¸°ë³¸ê°?"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:3041
+#: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "ì ?ë?¬(_F)"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:3042
 msgid "Forward the selected message to someone"
 msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ë?¤ë¥¸ ì?¬ë??ì??ê²? ì ?ë?¬í?©ë??ë?¤"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../mail/e-mail-reader.c:3061
+msgid "Group Reply"
+msgstr "ê·¸ë£¹ í??ì? "
+
+# tooltip
+#: ../mail/e-mail-reader.c:3062
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ë¡? í??ì? í??ê±°ë??, ì??ë??ë©´ ëª¨ë?  ì??ì? ì??ì??ê²? í??ì? í?©ë??ë?¤"
+
+#: ../mail/e-mail-reader.c:3107 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "ì?ì ?"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
-#: ../widgets/misc/e-calendar.c:193
+#: ../mail/e-mail-reader.c:3140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ë?¤ì??"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
-#: ../widgets/misc/e-calendar.c:169
+#: ../mail/e-mail-reader.c:3144
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ì?´ì ?"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:3154 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "í??ì? "
 
+#: ../mail/e-mail-reader.c:3722
+#, c-format
+msgid "Folder '%s'"
+msgstr "í?´ë?? '%s'"
+
 #: ../mail/e-mail-tag-editor.c:292
 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:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:77
+#: ../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:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:136
+#: ../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:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:520 ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL ì??í?¸í??"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:607
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ì?¬ì?© ì?½ê´?"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:614
 #, c-format
 msgid ""
 "\n"
@@ -10416,34 +10263,34 @@ msgstr ""
 "ë??ì??í??ì?¤ ê²½ì?° ì²´í?¬ ë?¨ì¶?ì?? ì²´í?¬í??ì?ì??ì?¤.\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:901 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:985
 msgid "Never"
 msgstr "ì?¬ì?© ì?? í?¨"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:986
 msgid "Always"
 msgstr "í?ì??"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:987
 msgid "Ask for each message"
 msgstr "ë©?ì??ì§?ë§?ë?¤ ë¬¼ì?´ë³´ê¸°"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1723 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2098
 msgid "Mail Configuration"
 msgstr "ë©?ì?¼ ì?¤ì ?"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2099
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10453,7 +10300,7 @@ msgstr ""
 "\n"
 "ì??ì??í??ë ¤ë©´ \"ì??ì?¼ë¡?\"ë¥¼ ë??ë¥´ì?ì??ì?¤."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2102
 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 "
@@ -10462,20 +10309,20 @@ msgstr ""
 "ì??ë??ì?? ì?´ë¦?ê³¼ ë©?ì?¼ ì£¼ì??ë¥¼ ì??ë ¥í??ì?ì??ì?¤. ê·¸ ì??ë??ì?? ì??ë?? \"ì¶?ê°?\" í??ë??ë?? ë©?ì?¼"
 "ì?? ë³´ë?¼ ë?? ì ?ë³´ë¥¼ ì¶?ê°?í??ì§? ì??ê³  ì?¶ì?¼ë©´ ì±?ì?°ì§? ì??ì??ë?? ë?©ë??ë?¤."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2261
+#: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "ë©?ì?¼ ë°?ê¸°"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2105
 msgid "Please configure the following account settings."
 msgstr "ë?¤ì?? ê³?ì ? ì?¤ì ?ì?? í??ì?ì??ì?¤."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
 msgid "Sending Email"
 msgstr "ë©?ì?¼ ë³´ë?´ê¸°"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2108
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10483,11 +10330,11 @@ msgstr ""
 "ë©?ì?¼ì?? ë³´ë?¼ ë°©ë²?ì?? ë??í?´ ì ?ë³´ë¥¼ ì??ë ¥í??ì?ì??ì?¤. ì?? ëª¨ë¥´ê² ì?¼ë©´, ì??ì?¤í?? ê´?ë¦¬ì??ë?? "
 "ì?¸í?°ë?· ì??ë¹?ì?¤ ì ?ê³µì??ì??ê²? ë¬¼ì?´ ë³´ì?ì??ì?¤."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2110
 msgid "Account Management"
 msgstr "ê³?ì ? ê´?ë¦¬"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2111
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10495,11 +10342,11 @@ msgstr ""
 "ì??ë?? ì¹¸ì?? ì?´ ê³?ì ?ì?? ë??í?´ ì?¤ëª?í??ë?? ì?´ë¦?ì?? ì??ë ¥í??ì?ì??ì?¤.\n"
 "ì?´ ì?´ë¦?ì?? í??ì??í??ë?? ëª©ì ?ì?¼ë¡?ë§? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2115
 msgid "Done"
 msgstr "ì??ë£?"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2116
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10514,56 +10361,52 @@ msgstr ""
 "ì?¤ì ?ì?? ì ?ì?¥í??ë ¤ë©´ \"ì ?ì?©\"ì?? ë??ë¥´ì?ì??ì?¤."
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2557
 msgid "Check for _new messages every"
 msgstr "ì?? ë©?ì?¼ í??ì?¸(_N), ë§¤"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2565
 msgid "minu_tes"
 msgstr "ë¶?(_T)"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2841
+msgid "Please select a folder from the current account."
+msgstr "í??í?? ê³?ì ?ì??ì?? í?´ë??ë¥¼ ì? í??í??ì?ì??ì?¤"
+
+#: ../mail/em-account-editor.c:3111 ../mail/mail-config.ui.h:112
 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:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:3156 ../mail/em-account-editor.c:3224
 msgid "Receiving Options"
 msgstr "ë°?ê¸° ì?µì??"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
 msgid "Checking for New Messages"
 msgstr "ì?? ë©?ì?¼ í??ì?¸"
 
-#: ../mail/em-account-editor.c:3418
-msgid "Account Editor"
-msgstr "ê³?ì ? í?¸ì§?ê¸°"
-
-#: ../mail/em-account-editor.c:3418
-msgid "Evolution Account Assistant"
-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:1578
+#: ../mail/em-composer-utils.c:1729
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "%sì??ê²? ë³´ë?¸ \"%s\"ì?? ê´?í?? (ë³´ë?¸ ë?? %s) ë©?ì??ì§?ë¥¼ ì?½ì??ì?µë??ë?¤."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1777
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ë?¤ì?? ë©?ì?¼ì?? ë??í?? ë°°ë?¬ í??ì?¸: \"%s\""
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:2186
 msgid "an unknown sender"
 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 em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:2233
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10572,21 +10415,21 @@ msgstr ""
 "${TimeZone}, ${Sender}:"
 
 # ë²?ì?ì?? ì ?í?©í??ì§? ì??ë?¤.
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2377
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
 # post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2589
 msgid "Posting destination"
 msgstr "ê²?ì??ë¬¼ ì??ì? ì??"
 
 # post -> ê²?ì??, Microsoft Office XP ì°¸ê³ 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2590
 msgid "Choose folders to post the message to."
 msgstr "ë©?ì??ì§?ë¥¼ ì?¬ë¦´ í?´ë??ë¥¼ ì? í??í??ì?ì??ì?¤."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "í?´ë?? ì? í??"
 
@@ -10603,10 +10446,18 @@ msgstr "ì?? ì§?ì ?"
 msgid "Assign Score"
 msgstr "ì ?ì?? ì§?ì ?"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "ì?¨ê¸´ ì°¸ì¡°"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "ì?? ì??ë¦¬"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "ì°¸ì¡°"
+
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
@@ -10675,6 +10526,10 @@ msgstr "ì¶?ê°? ì??ì??"
 msgid "Forward to"
 msgstr "ì ?ë?¬"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "ì¤?ì??"
+
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
@@ -10705,7 +10560,7 @@ msgstr "ì?¤ì ? ì??ë??"
 msgid "is set"
 msgstr "ì?¤ì ?"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
 msgid "Junk"
 msgstr "ì ?í?¬ë©?ì?¼"
 
@@ -10754,7 +10609,7 @@ msgid "Play Sound"
 msgstr "ì?¬ì?´ë?? ì?¬ì??"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "ì?½ì??"
 
@@ -10840,39 +10695,39 @@ msgid "Unset Status"
 msgstr "ì??í?? ì?¤ì ? ì??ì? ê¸°"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "ê·¸ë?¬ë©´"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "ë??ì?? ì¶?ê°?(_T)"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ì?½ì§? ì??ì?? ë©?ì??ì§?:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ì ?ì²´ ë©?ì??ì§?:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "ì?©ë?? ì ?í?? ì?¬ì?©ë?? (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "ì?©ë?? ì ?í?? ì?¬ì?©ë??"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "í?´ë?? ì??ì?±"
 
@@ -10880,33 +10735,33 @@ msgstr "í?´ë?? ì??ì?±"
 msgid "<click here to select a folder>"
 msgstr "<í?´ë??ë¥¼ ê³ ë¥¼ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "ë§?ë?¤ê¸°(_R)"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "í?´ë?? ì?´ë¦?(_N):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1067 ../mail/mail-vfolder.c:1132
 msgid "Search Folders"
 msgstr "ê²?ì?? í?´ë??"
 
 # VFolderì??ì?? ë§?ë?? ê²? ì??ë¬´ê²?ë?? ì??ì?? ê²½ì?° ë§?ì§?ë§? fallback
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "í?´ë?¹ ì??ì??"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "ì?½ì?´ë?¤ì?´ë?? ì¤?..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:184
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"ì?? í?´ë??ë¥¼ ì°¾ë?? ì¤?"
@@ -10933,74 +10788,75 @@ msgstr "í?´ë?? ì?´ë¦?ì?? '/'ê°? ë?¤ì?´ê°? ì?? ì??ì?µë??ë?¤"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1084
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1318
 msgid "Mail Folder Tree"
 msgstr "ë©?ì?¼ í?´ë?? í?¸ë¦¬"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s í?´ë??ë¥¼ ì?®ê¸°ë?? ì¤?"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s í?´ë??ë¥¼ ë³µì?¬í??ë?? ì¤?"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "ë©?ì??ì§?ë¥¼ %s í?´ë??ë¡? ì?®ê¸°ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "ë©?ì??ì§?ë¥¼ %s í?´ë??ë¡? ë³µì?¬í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1650
+#, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ë©?ì??ì§?ë¥¼ ë§¨ ì??ì?? ì ?ì?¥ê³ ì?? ë?£ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Move Folder To"
 msgstr "í?´ë?? ì?®ê¸°ê¸°"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Copy Folder To"
 msgstr "í?´ë?? ë³µì?¬"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "`%s' í?´ë??ë¥¼ ë§?ë??ë?? ì¤?ì??ë??ë?¤"
+msgid "Creating folder '%s'"
+msgstr "'%s' í?´ë??ë¥¼ ë§?ë??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
 msgid "Create Folder"
 msgstr "í?´ë?? ë§?ë?¤ê¸°"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Specify where to create the folder:"
 msgstr "í?´ë?? ë§?ë?¤ ê³³ì?? ì§?ì ?í??ì?ì??ì?¤:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:714
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "\"%s\" í?´ë??ë¥¼ êµ¬ë?? í?´ì ?í??ë?? ì¤?"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
 msgstr "ì??ëª? ì??ì??"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11008,11 +10864,11 @@ msgstr ""
 "ì?´ ë©?ì??ì§?ì??ë?? ì??ëª?ì?´ ì??ì?µë??ë?¤.  ë©?ì??ì§?ë¥¼ ë³´ë?¸ ì?¬ë??ì?´ í??ì?¤í?? ì§? ë³´ì?¥í?  ì?? ì??ì?µ"
 "ë??ë?¤."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
 msgstr "ì?¬ë°?ë¥¸ ì??ëª?"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11020,11 +10876,11 @@ msgstr ""
 "ì?´ ë©?ì??ì§?ë?? ì??ëª?ë??ì??ê³  ì??ëª?ì?´ ì?¬ë°?ë¦?ë??ë?¤.  ë©?ì??ì§?ë¥¼ ë³´ë?¸ ì?¬ë??ì?? ê·¸ ì?¬ë??ì?´ ê±°"
 "ì?? í??ì?¤í?©ë??ë?¤."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
 msgstr "ì??ëª»ë?? ì??ëª?"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11032,11 +10888,11 @@ msgstr ""
 "ì?´ ë©?ì??ì§?ì?? ì??ëª?ì?? í??ì?¸í?  ì?? ì??ì?µë??ë?¤. ë©?ì?¼ì?´ ì ?ì?¡ì¤?ì?? ë³?ê²½ë??ì??ì?? ì?? ì??ì?µë??"
 "ë?¤."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
 msgid "Valid signature, but cannot verify sender"
 msgstr "ì?¬ë°?ë¥¸ ì??ëª?ì?´ì§?ë§?, ë³´ë?¸ ì?¬ë??ì?? í??ì?¸í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11044,21 +10900,21 @@ msgstr ""
 "ì?´ ë©?ì??ì§?ë?? ì?¬ë°?ë¥¸ ì??ëª?ì?¼ë¡? ì?¬ì?¸ë??ì??ì?µë??ë?¤. í??ì§?ë§? ë©?ì??ì§?ë¥¼ ë³´ë?¸ ì?¬ë??ì?? í??ì?¸"
 "í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
 msgid "Signature exists, but need public key"
 msgstr "ì??ëª?ì?´ ì??ì§?ë§?, ê³µê°?í?¤ê°? í??ì??í?©ë??ë?¤"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ì?´ ë©?ì??ì§?ë?? ì??ëª?ë??ì?´ ì??ì§?ë§?, ì??ëª?ì?? í?´ë?¹í??ë?? ê³µê°? í?¤ê°? ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
 msgid "Unencrypted"
 msgstr "ì??í?¸í?? ì?? ë?¨"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11066,11 +10922,11 @@ msgstr ""
 "ì?´ ë©?ì??ì§?ë?? ì??í?¸í??í??ì§? ì??ì??ì?µë??ë?¤.  ì?¸í?°ë?·ì?? í?µí?´ ì ?ë?¬ë??ë?? ë??ì?? ë?¤ë¥¸ ì?¬ë??ì?´ "
 "ì?´ ë©?ì??ì§?ë¥¼ ë´¤ì?? ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
 msgid "Encrypted, weak"
 msgstr "ì??í?¸í??ë?¨, ì?½í?¨"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -11080,11 +10936,11 @@ msgstr ""
 "ì?¬ë??ì?´ ì?´ ë©?ì??ì§?ì?? ë?´ì?©ì?? ì??ì?? ë?´ë?? ê²? ì?´ë µê¸´ í??ì§?ë§?, í??ì?¤ì ?ì?¸ ì??ê°? ë?´ì?? ë¶?ê°?"
 "ë?¥í??ì§?ë?? ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
 msgid "Encrypted"
 msgstr "ì??í?¸í??ë?¨"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11092,11 +10948,11 @@ msgstr ""
 "ë©?ì??ì§?ê°? ì??í?¸í??ë??ì?´ ì??ì?µë??ë?¤.  ë?¤ë¥¸ ì?¬ë??ì?´ ì?´ ë©?ì??ì§?ì?? ë?´ì?©ì?? ì??ì?? ë?´ê¸°ë?? ì?´"
 "ë µì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
 msgid "Encrypted, strong"
 msgstr "ì??í?¸í??ë?¨, ê°?ë ¥"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -11105,15 +10961,15 @@ msgstr ""
 "ë©?ì??ì§?ê°? ì??í?¸í??ë??ì?´ ì??ì§?ë§?, ì?½í?? ì??í?¸í?? ì??ê³ ë¦¬ì¦?ì?¼ë¡? ì??í?¸í??ë??ì??ì?µë??ë?¤.  í??ì?¤"
 "ì ?ì?¸ ì??ê°? ë?´ì?? ë?¤ë¥¸ ì?¬ë??ì?´ ì?´ ë©?ì??ì§?ì?? ë?´ì?©ì?? ì??ì?? ë?´ë?? ê±´ ë§¤ì?° ì?´ë µì?µë??ë?¤."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "ì?¸ì¦?ì?? ë³´ê¸°(_V)"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "ì?´ ì?¸ì¦?ì??ë?? ë³¼ ì?? ì??ì?µë??ë?¤"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11122,118 +10978,137 @@ msgstr ""
 "ê·¸ë??ë¡? ë³´ê±°ë?? ì?¸ë¶? í??ì?¤í?¸ í?¸ì§?ê¸°ë¡? ë³¼ ì?? ì??ì?µë??ë?¤."
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "ì??ë£? ë? ì§?"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:733
 msgid "Overdue:"
 msgstr "ë§?ê°? ì§?ë?¨:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "ë? ì§?:"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
 msgid "View _Unformatted"
 msgstr "ì??ë³¸ ë³´ê¸°(_U)"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:951
 msgid "Hide _Unformatted"
-msgstr "ì??ë³¸ ê°?ì¶?ê¸°(_U)"
+msgstr "ì??ë³¸ ì?¨ê¸°ê¸°(_U)"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1016
 msgid "O_pen With"
 msgstr "ë?¤ë¥¸ í??ë¡?ê·¸ë?¨ì?¼ë¡? ì?´ê¸°(_P)"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2$dí??ì?´ì§? ì¤? %1$dí??ì?´ì§?"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:153
 msgid "Formatting message"
 msgstr "ë©?ì??ì§? ë?´ì?©ì?? í??ì??í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
 msgstr "ë©?ì??ì§? ë?´ì?©ì?? í??ì??í??ë?? ì¤?ì??ë??ë?¤..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' ê°?ì ¸ì?¤ë?? ì¤?"
+msgid "Retrieving '%s'"
+msgstr "'%s' ê°?ì ¸ì?¤ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1901
 msgid "Unknown external-body part."
 msgstr "ì?¸ë¶? ë³¸ë¬¸ ë¶?ë¶?ì?´ ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1909
 msgid "Malformed external-body part."
 msgstr "ì?¸ë¶? ë³¸ë¬¸ ë¶?ë¶?ì?? í??ì??ì?´ ì??ëª»ë??ì??ì?µë??ë?¤."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ì?¬ì?´í?¸(%s)ë¥¼ ê°?ë¦¬í?µë??ë?¤"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1950
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "ì?¬ì?´í?¸ \"%2$s\"ì?? ë¡?ì»¬ í??ì?¼(%1$s)ì?? ê°?ë¦¬í?µë??ë?¤"
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1952
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ë¡?ì»¬ í??ì?¼(%s)ì?? ê°?ë¦¬í?µë??ë?¤"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1973
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "ì??ê²© ë?°ì?´í?°(%s)ì?? ê°?ë¦¬í?µë??ë?¤"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1984
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ì?? ì?? ì??ë?? ì?¸ë¶? ë?°ì?´í?°(\"%s\" í??ì??)ì?? ê°?ë¦¬í?µë??ë?¤"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2647
+#, 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 "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "ì?´ ë©?ì??ì§?ë?? <b>%s</b>ì?´(ê°?) <b>%s</b> ì??ê²©ì?¼ë¡? ë³´ë??ì?µë??ë?¤."
+msgid "No HTML stream available"
+msgstr "HTML ì?¤í?¸ë¦¼ì?´ ì??ì?µë??ë?¤"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "ì?´ ì ?ì?¥ê³ ë?? ê°?ì??ì?? ì§?ì??í??ì§? ì??ê±°ë??, ê°?ì??í?  ì?? ì??ë??ë¡? ì?¤ì ?í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
 msgstr "êµ¬ë??"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
 msgstr "í?´ë??"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1120
 msgid "Please select a server."
 msgstr "ì??ë²?ë¥¼ ì? í??í??ì?ì??ì?¤."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
 msgstr "ì??ë²?ë¥¼ ì? í??í??ì§? ì??ì??ì?µë??ë?¤"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more
+#. * messages to be opened.  The %d is replaced with the actual
+#. * count of messages. If you need a '%' in your text, then
+#. * write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d message at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "ì ?ë§?ë¡? %dê°?ì?? ë©?ì??ì§?ë¥¼ ë??ì??ì?? ì?¬ì??ê² ì?µë??ê¹??"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "ì?´ ë©?ì??ì§? ë?¤ì?? ë³´ì§? ì??ê¸°(_D)"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "ë©?ì??ì§? í??í?°"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
 msgstr "%sì??ì?? ì?¨ ë©?ì?¼"
@@ -11242,7 +11117,7 @@ msgstr "%sì??ì?? ì?¨ ë©?ì?¼"
 msgid "Search _Folders"
 msgstr "í?´ë?? ê²?ì??(_F)"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "í?´ë?? ì¶?ê°?"
 
@@ -11282,52 +11157,48 @@ msgstr "\"ë©?ì?¼ ë³´ë?´ê³  ë°?ê¸°\" ìµ?ë??í?? ì??í??"
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"ë©?ì?¼ ë³´ë?´ê³  ë°?ê¸°\" ì°½ ë??ë¹?"
 
-#: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "ì??ë³¼ë£¨ì??ì??ì?? ìµ?ë?? í?¬ê¸°ë§?í?¼ì?? í??ì?¤í?¸ ì?¼ë¶?ë¶?ë§? í??ì??í??ë??ë¡? í?©ë??ë?¤"
-
 # read receipt -> ë?´ì?© ì?½ì?? í??ì?¸, Microsoft Office XP ì°¸ê³ 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Always request read receipt"
 msgstr "í?ì?? ë?´ì?© ì?½ì?? í??ì?¸ ì??ì²"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "ì?´ëª¨í?°ì½? ì??ë?? ì?¸ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "ë§?í?¬ ì??ë?? ì?¸ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "ì ?í?¬ë©?ì?¼ ê²?ì?¬"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "ì?¸ì?©ë¬¸ ê°?ì¡° ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "ì?¸ì?©ë¬¸ ê°?ì¡° ì??."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "ë©?ì??ì§? ì??ì?± ì°½ ê¸°ë³¸ ë??ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "ë©?ì??ì§? ì??ì?± ì°½ ê¸°ë³¸ ë??ë¹?"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "ë©?ì??ì§? ì??ì?± ì?½ì?´ë?¤ì?´ê¸°/ì²¨ë¶? ë??ë ?í?°ë¦¬"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "ë°?ë?? ì?¬ë??/ì°¸ì¡°/ì?¨ì?? ì°¸ì¡°ì?? ì£¼ì??ë¥¼ ê°?ë?µí??ê²? í??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11335,7 +11206,7 @@ msgstr ""
 "ë°?ë?? ì?¬ë??/ì°¸ì¡°/ì?¨ì?? ì°¸ì¡°ì?? ì£¼ì??ë¥¼ address_countì?? ì§?ì ?í?? ê°?ì??ë§?í?¼ ê°?ë?µí??ê²? í??"
 "ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11343,11 +11214,11 @@ msgstr ""
 "ì?¼ë§?ë?? ì??ì£¼ ë¡?ì»¬ì?? ë³?ê²½ ì?¬í?ì?? ì??ê²© ë©?ì?¼ ì??ë²?ì?? ë??ê¸°í??í? ì§? ì ?í?©ë??ë?¤. ì?´ ê°?ê²©"
 "ì?? ìµ?ì??í?? 30ì´? ì?´ì?? ë??ì?´ì?¼ í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "ì ?í?¬ ë©?ì?¼ì?? ê²?ì?¬í?  ë?? ì?¬ì?©í?  ì?¬ì?©ì?? ì§?ì ? í?¤ë??."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11355,73 +11226,73 @@ msgstr ""
 "ì ?í?¬ ë©?ì?¼ì?? ê²?ì?¬í?  ë?? ì?¬ì?©í?  ì?¬ì?©ì?? ì§?ì ? í?¤ë??. ëª©ë¡?ì?? ê°? í?ëª©ì?? \"í?¤ë??ì?´ë¦?=ê°?"
 "\" í??ì??ì?? ë¬¸ì??ì?´ì??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "ë©?ì??ì§?ë¥¼ ì??ì?±í?  ê¸°ë³¸ ë¬¸ì??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "ë©?ì??ì§?ë¥¼ ì??ì?±í?  ê¸°ë³¸ ë¬¸ì??ì??."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "ë©?ì??ì§?ë¥¼ í??ì??í?  ê¸°ë³¸ ë¬¸ì??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "ë©?ì??ì§?ë¥¼ í??ì??í?  ê¸°ë³¸ ë¬¸ì??ì??."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "ê¸°ë³¸ ì ?ë?¬ ëª¨ì??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "ë©?ì??ì§? ì??ì?± ì°½ì?? ê¸°ë³¸ ë??ì?´."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "ë©?ì?¼ ë³´ê¸° ì°½ì?? ê¸°ë³¸ ë??ì?´."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "êµ¬ë?? ë??í?? ì??ì??ì?? ê¸°ë³¸ ë??ì?´."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "ë©?ì?¼ ë³´ê¸° ì°½ì?? ê¸°ë³¸ ìµ?ë??í?? ì??í??."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "ê¸°ë³¸ í??ì?  ëª¨ì??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "ê¸?í??ë?? í??ì?¥ ì??í??ì?? ë??í?? ê¸°ë³¸ê°?"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "ë©?ì??ì§? ì??ì?± ì°½ì?? ê¸°ë³¸ ë??ë¹?."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "ë©?ì?¼ ë³´ê¸° ì°½ì?? ê¸°ë³¸ ë??ë¹?."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "êµ¬ë?? ë??í?? ì??ì??ì?? ê¸°ë³¸ ë??ë¹?."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "ì ?í?¬ë©?ì?¼ í??í?°ë§?í?  ë?? ë¡?ì»¬ ì£¼ì??ë¡?ì??ì??ë§? ì£¼ì??ë¥¼ ì°¾ì?? ë³¼ ì§? ê²°ì ?í?©ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "ì£¼ì??ë¡?ì??ì?? ë³´ë?¸ ì?¬ë?? ì ?ì??ë©?ì?¼ì?? ì°¾ì??ë³¼ ì§? ê²°ì ?í?©ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11432,11 +11303,11 @@ msgstr ""
 "í?¸ ë©?ì?¼ì?´ ì??ë??ë?¼ê³  í??ë?¨í?©ë??ë?¤. ì??ë?? ì??ì?± ì?©ë??ë¡?ë?? ì£¼ì??ë¡?ì?? ì°¾ì?? ë´?ë??ë?¤. LDAP"
 "ì?? ê°?ì?? ì??ê²© ì£¼ì??ë¡?ì?? ì??ë?? ì??ì?±ì?? ì?¬ì?©í?  ê²½ì?° ë??ë¦´ ì??ë?? ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "ì ?í?¬ ë©?ì?¼ ê²?ì?¬ì?? ì?¬ì?©ì?? ì§?ì ? í?¤ë??ë¥¼ ì?¬ì?©í? ì§? ê²°ì ?í?©ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11445,7 +11316,7 @@ msgstr ""
 "ì ?í?¬ ë©?ì?¼ ê²?ì?¬ì?? ì?¬ì?©ì?? ì§?ì ? í?¤ë??ë¥¼ ì?¬ì?©í? ì§? ê²°ì ?í?©ë??ë?¤. ì?´ ì?µì??ì?? ì?¬ì?©í??ê³  "
 "í?¤ë??ë¥¼ ì§?ì ?í??ë©´ ì ?í?¬ ë©?ì?¼ ê²?ì?¬ ê¸°ë?¥ì?? ì??ë??ë¥¼ ë??ì?¼ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11453,18 +11324,22 @@ msgstr ""
 "ì?¸ë¡? ë³´ê¸°ì?? \"ë©?ì??ì§?\" ì?´ì??ì?? \"ë³´ë?¸ ì?¬ë??\" ë°? \"ì ?ëª©\" ì¤?ì?? ê°?ì?? ê¸?ê¼´ì?? ì?¬ì?©"
 "í? ì§? ê²°ì ?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "ë©?ì??ì§? ì??ì?±ì?? í??ì?¼ì?? ì?½ì?´ë?¤ì?´ê³  ì²¨ë¶?í?  ë?? ì?¬ì?©í?  ë??ë ?í?°ë¦¬."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "ë©?ì?¼ ê´?ë ¨ í??ì?¼ì?? ì ?ì?¥í?  ë??ë ?í?°ë¦¬."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "ê°?ì?¥ì??ë¦¬ ì°½ì?? í?´ë?? ì?´ë¦? ì¤?ì?¬ ì?°ê¸° ì?¬ì?©ì?? ë§?ì??ì§? ì?¬ë¶?"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "ì?¼ì ? í?¬ê¸°ë¥¼ ë??ì?´ê°?ì§? ì??ë?? ë©?ì??ì§? í??ì?¤í?¸ë§? í??ì??"
+
 # ë©?ì?¼ì?? ì??ëª? ì??ì?? ë?¤ì?´ ì??ë?? '--' ë?°ì??
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
@@ -11537,18 +11412,32 @@ msgstr ""
 "ë¥¼ ì?¤í?¬ë¡¤í?©ë??ë?¤."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "ì ?í??ë?? í?¬ê¸°ë§?í?¼ì?? ì?¼ë¶? í??ì?¤í?¸ë¥¼ í??ì??í??ë??ë¡? í?©ë??ë?¤."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"ì?´ ê¸°ë?¥ì?? ì?¬ì?©í??ë©´ 'message_text_part_limit' í?¤ì?? ì ?ì??í?? í?¬ê¸°ë¥¼ ë??ì?´ê°?ì§? ì??"
+"ë?? í??ì?¤í?¸ë§? í??ì??í?©ë??ë?¤."
 
 #: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+"ì?´ ê¸°ë?¥ì?? ì?¬ì?©í??ë©´ ëª¨ë?  í?´ë??ì?? ë¹?ì?·í?? ë©?ì??ì§? ëª©ë¡? ë³´ê¸° ì?¤ì ?ì?? ì?¬ì?©í?©ë??ë?¤"
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"ì?´ ê¸°ë?¥ì?? ì?¬ì?©í??ë©´ ëª¨ë?  í?´ë??ì?? ë¹?ì?·í?? ë©?ì??ì§? ëª©ë¡? ë³´ê¸° ì?¤ì ?ì?? ì?¬ì?©í?©ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "ìº?ë¦¿ ëª¨ë?? ì¼?ê¸°/ë??ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "í??ì?¼ ì?´ë¦?ì?? ì??ì??ë£©/êµ¬ê¸? ë©?ì?¼ ë°©ì??ì?¼ë¡? ì?¸ì½?ë?©"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11560,25 +11449,33 @@ msgstr ""
 "ì?µë??ë?¤. ì??ì??ë£©ì?´ë?? ì§?ë©?ì?¼ì?? RFC 2231ì?? ë?°ë¥´ì§? ì??ê³  ì?¬ë°?ë¥´ì§? ì??ì?? ë°©ë²?ì?¼ë¡? "
 "RFC 2047 í??ì¤?ì?? ì?¬ì?©í??ê³  ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr "í??í?°ë§? í??ì?? ë³´ë?¸ í?¸ì§?í?¨ í??ë?¬ì??"
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Group Reply replies to list"
+msgstr "ê·¸ë£¹ í??ì? ì?? ì?¤ì ?í??ë©´ ë¦¬ì?¤í?¸ë¡? í??ì? í?©ë??ë?¤"
+
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
 msgstr "ë©?ì??ì§? ëª©ë¡? ì°½ì?? ë??ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane."
 msgstr "ë©?ì??ì§? ëª©ë¡? ì°½ì?? ë??ì?´."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "í?´ë??ë³? ë¯¸ë¦¬ ë³´ê¸°ë¥¼ ê°?ì¶?ê³  ì? í??ì?? ì??ì?±ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "ì?¬ì?©ì??ê°? 10ê°? ì?´ì??ì?? ë©?ì??ì§?ë¥¼ í??ë²?ì?? ì?´ë©´, ì ?ë§?ë¡? ì?´ ì§? ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11588,7 +11485,11 @@ msgstr ""
 "ì?? ë³´ë?¸ë³´ ì»´í?¬ë??í?¸ ë·°ì?´ë¡? ë§¤í??ë??ë?? (ê·¸ë??ì?? MIME í??ì?? ë?°ì?´í?°ë² ì?´ì?¤ì??ì??) ë·°ì?´"
 "ê°? ë?´ì?©ì?? í??ì??í??ë??ë?° ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Ignore list Reply-To:"
+msgstr "ë¦¬ì?¤í?¸ Reply-To: ë¬´ì??"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -11596,7 +11497,7 @@ msgstr ""
 "\"í??í?° í?¸ì§?\" ì°½ì?? ìµ?ì´? ë??ì?´. ì?¬ì?©ì??ê°? ì?¸ë¡? ë°©í?¥ì?¼ë¡? ì°½ í?¬ê¸°ë¥¼ ë°?ê¾¸ë©´ ì?´ ê°?"
 "ì?´ ë°?ë??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11604,7 +11505,7 @@ msgstr ""
 "\"ê²?ì?? í?´ë?? í?¸ì§?\" ì°½ì?? ìµ?ì´? ë??ì?´. ì?¬ì?©ì??ê°? ì?¸ë¡? ë°©í?¥ì?¼ë¡? ì°½ í?¬ê¸°ë¥¼ ë°?ê¾¸ë©´ "
 "ì?´ ê°?ì?´ ë°?ë??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11612,7 +11513,7 @@ msgstr ""
 "\"ë©?ì?¼ ë³´ë?´ê³  ë°?ê¸°\" ì°½ì?? ìµ?ì´? ë??ì?´. ì?¬ì?©ì??ê°? ì?¸ë¡? ë°©í?¥ì?¼ë¡? ì°½ í?¬ê¸°ë¥¼ ë°?ê¾¸ë©´ "
 "ì?´ ê°?ì?´ ë°?ë??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11623,7 +11524,7 @@ msgstr ""
 "ë§?ë?¤ ì?´ ê°?ì?´ ë°?ë??ë??ë?¤. \"í??í?° í?¸ì§?\" ì°½ì?? ìµ?ë??í??í?  ì?? ì??ê¸° ë??ë¬¸ì?? ì?´ ê°?ì?? ì?¤"
 "ì ?ë¡?ë?? ì?¬ì?©í??ì§? ì??ì?µë??ë?¤. ì?´ í?¤ë?? ë?´ë¶? ì?©ë??ë¡?ë§? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11634,7 +11535,7 @@ msgstr ""
 "í?  ë??ë§?ë?¤ ì?´ ê°?ì?´ ë°?ë??ë??ë?¤. \"ê²?ì?? í?´ë?? í?¸ì§?\" ì°½ì?? ìµ?ë??í??í?  ì?? ì??ê¸° ë??ë¬¸ì?? "
 "ì?´ ê°?ì?? ì?¤ì ?ë¡?ë?? ì?¬ì?©í??ì§? ì??ì?µë??ë?¤. ì?´ í?¤ë?? ë?´ë¶? ì?©ë??ë¡?ë§? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11646,7 +11547,7 @@ msgstr ""
 "ì??í?  ë??ë§?ë?¤ ì?´ ê°?ì?´ ë°?ë??ë??ë?¤. \"ë©?ì?¼ ë³´ë?´ê³  ë°?ê¸°\" ì°½ì?? ìµ?ë??í??í?  ì?? ì??ê¸° ë??ë¬¸"
 "ì?? ì?´ ê°?ì?? ì?¤ì ?ë¡?ë?? ì?¬ì?©í??ì§? ì??ì?µë??ë?¤. ì?´ í?¤ë?? ë?´ë¶? ì?©ë??ë¡?ë§? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -11654,7 +11555,7 @@ msgstr ""
 "\"í??í?° í?¸ì§?\" ì°½ì?? ìµ?ì´? ë??ë¹?. ì?¬ì?©ì??ê°? ê°?ë¡? ë°©í?¥ì?¼ë¡? ì°½ í?¬ê¸°ë¥¼ ë°?ê¾¸ë©´ ì?´ ê°?"
 "ì?´ ë°?ë??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11662,7 +11563,7 @@ msgstr ""
 "\"ê²?ì?? í?´ë?? í?¸ì§?\" ì°½ì?? ìµ?ì´? ë??ë¹?. ì?¬ì?©ì??ê°? ê°?ë¡? ë°©í?¥ì?¼ë¡? ì°½ í?¬ê¸°ë¥¼ ë°?ê¾¸ë©´ "
 "ì?´ ê°?ì?´ ë°?ë??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11670,7 +11571,17 @@ msgstr ""
 "\"ë©?ì?¼ ë³´ë?´ê³  ë°?ê¸°\" ì°½ì?? ìµ?ì´? ë??ë¹?. ì?¬ì?©ì??ê°? ê°?ë¡? ë°©í?¥ì?¼ë¡? ì°½ í?¬ê¸°ë¥¼ ë°?ê¾¸ë©´ "
 "ì?´ ê°?ì?´ ë°?ë??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+"ì?¼ë°? \"ì ?ì²´ í??ì? \" ë??ì??ê³¼ë?? ë?¤ë¥´ê²?, ì?´ ì?µì??ì?? ì?¬ì?©í??ë©´ \"ê·¸ë£¹ í??ì? \" ë??êµ¬ ëª¨"
+"ì?? ë?¨ì¶?ë¥¼ ì?¬ì?©í??ì?? ë?? ì??ë³¸ ë©?ì?¼ì?? í?´ë?¹ ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??ë§? ë?µì?¥í?©ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -11679,35 +11590,60 @@ msgstr ""
 "ê²?ì?? ê²°ê³¼ì??ì?? ì ?ê±°í??ë?? ê²? ì??ë??ë?¼, ì°¾ê¸° í?´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ì§?ì?¸ ê²½ì?° ë©?ì??ì§?ë¥¼ "
 "ì??êµ¬í?? ì?ì ?í??ë?¤ê³  ë°?ë³µí?´ì?? ê²½ê³ í??ë?? ê¸°ë?¥ì?? ë??ê³  ì¼ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+"ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??ì?? ë°?ì?? ë©?ì??ì§?ì?? ê°?ì?¸ ë?µì?¥ì?? ë³´ë?¼ ê²½ì?° ë°?ë³µí?´ì?? ê²½ê³ í??ë?? ê¸°ë?¥"
+"ì?? ë??ê³  ì¼ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"ë§?ì?? ì?¬ë??ì??ê²? í??ì? ì?? ë³´ë?´ë ¤ í?  ë?? ë°?ë³µí?´ì?? ê²½ê³ í??ë?? í??ì?¸ ì°½ì?? ë??ê³  ì¼ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+"ë©?ì?¼ë§? ë¦¬ì?¤í?¸ë¡? ë°?ì?? ë©?ì??ì§?ì?? ê°?ì?¸ ë?µì?¥ì?? ë³´ë?´ë ¤ í??ë??ë?°, ê·¸ ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??"
+"ì?? Reply-To: í?¤ë??ê°? ì?¤ì ?ë??ì?´ ì??ì?´ì?? ë?µì?¥ì?? ë¦¬ì?¤í?¸ë¡? ë³´ë?´ê²? ë??ë?? ê²½ì?° ë°?ë³µí?´"
+"ì?? ê²½ê³ í??ë?? í??ì?¸ ì°½ì?? ë??ê³  ì¼ë??ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Last time Empty Junk was run"
 msgstr "ë§?ì§?ë§?ì?¼ë¡? ì ?í?¬ ë©?ì?¼ì?? ë¹?ì?´ ì??ê°?"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Last time Empty Trash was run"
 msgstr "ë§?ì§?ë§?ì?¼ë¡? í?´ì§?í?µì?? ë¹?ì?´ ì??ê°?"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Layout style"
 msgstr "ë°°ì¹? ë°©ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of Labels and their associated colors"
 msgstr "ë ?ì?´ë¸? ë°? ë ?ì?´ë¸? ì??ì?? ëª©ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "ë³´ë?¸ë³´ ì»´í?¬ë??í?¸ ë·°ì?´ê°? ì??ë??ì§? ê²?ì?¬í?  MIME í??ì?? ëª©ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
 msgstr "ì?¹ì?¸í?? ì?½ê´?ì?? ëª©ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "List of accounts"
 msgstr "ê³?ì ? ëª©ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11715,15 +11651,15 @@ msgstr ""
 "ì??ë³¼ë£¨ì??ì?? ë©?ì?¼ ì»´í?¬ë??í?¸ì?? ì?¬ì?©í?  ê³?ì ? ëª©ë¡?ì??ë??ë?¤. ì?´ ëª©ë¡?ì??ë?? /apps/"
 "evolution/mail/accountsì?? ì??ë??ì ?ì?¸ ì??ë¸?ë??ë ?í?°ë¦¬ì?? ì?´ë¦?ì?´ ë?¤ì?´ ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
 msgstr "ì?¬ì?©ì?? ì§?ì ? í?¤ë??ì?? ê·¸ í?¤ë??ë¥¼ ì?¬ì?©í? ì§? ì?¬ë¶?ì?? ëª©ë¡?."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ë§?ì¶¤ë²? ê²?ì?¬ì?? ì?¬ì?©í?  ì?¬ì ?ì?? ì?¸ì?´ ì½?ë?? ëª©ë¡?."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -11731,15 +11667,15 @@ msgstr ""
 "ì??ë³¼ë£¨ì??ì?? ë©?ì?¼ ì»´í?¬ë??í?¸ì?? ì?¬ì?©í?  ë ?ì?´ë¸? ëª©ë¡?ì??ë??ë?¤. ì?´ ëª©ë¡?ì??ë?? <ì?´ë¦?>:<ì??> "
 "í??ì??ì?? ë¬¸ì??ì?´ì?´ ë?¤ì?´ ì??ì?µë??ë?¤. ì??ì?? HTML ë°©ì?? 16ì§?ì?? ì?¸ì½?ë?©ì?? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
 msgstr "ì?½ê´?ì?? ë??ì??í?? í??ë¡?í? ì½? ì?´ë¦?ì?? ëª©ë¡?."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTTPë¥¼ í?µí?´ HTML ë©?ì??ì§?ì?? ê·¸ë¦¼ì?? ì?½ì?´ë?¤ì??ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -11749,233 +11685,245 @@ msgstr ""
 "ë?¤í?¸ì??í?¬ì??ì?? ê·¸ë¦¼ì?? ì?½ì?´ë?¤ì?´ì§? ì??ì?µë??ë?¤. \"1\" - ì£¼ì??ë¡?ì?? ì??ë?? ì?¬ë??ì?? ë©?ì?¸ì§? "
 "ê·¸ë¦¼ì?? ì?½ì?´ë?¤ì??ë??ë?¤. \"2\" - í?ì?? ë?¤í?¸ì??í?¬ì??ì?? ê·¸ë¦¼ì?? ì?½ì?´ë?¤ì??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
 msgstr "í??í?° ë??ì?? ê¸°ë¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
 msgstr "ì§?ì ?í?? ë¡?ê·¸ í??ì?¼ì?? ë??í?? í??í?° ë??ì??ì?? ê¸°ë¡?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
 msgstr "í??í?° ë??ì??ì?? ê¸°ë¡?í?  ë¡?ê·¸ í??ì?¼"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
 msgstr "í??í?° ë??ì??ì?? ê¸°ë¡?í?  ë¡?ê·¸ í??ì?¼ì??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
 msgstr "ë©?ì?¼ ë³´ê¸° ë??ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Mail browser maximized"
 msgstr "ë©?ì?¼ ë³´ê¸° ìµ?ë??í??"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Mail browser width"
 msgstr "ë©?ì?¼ ë³´ê¸° ë??ë¹?"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
 msgstr "ì?¼ì ? ì??ê°?ì?´ ì§?ë??ë©´ ì?½ì?? ê²?ì?¼ë¡? í??ì??í??ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
 msgstr "ì?¼ì ? ì??ê°?ì?´ ì§?ë??ë©´ ì?½ì?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
 msgstr "ë©?ì??ì§? \"ë¯¸ë¦¬ ë³´ê¸°\"ì??ì?? ì?¸ì?©í?? ë¶?ë¶?ì?? í??ì??í??ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ë©?ì??ì§? \"ë¯¸ë¦¬ ë³´ê¸°\"ì??ì?? ì?¸ì?©í?? ë¶?ë¶?ì?? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Message text limit for display"
+msgstr "ë©?ì??ì§? ë¬¸ì?? í??ì?? ì ?í??"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ë©?ì??ì§?-í??ì?? ëª¨ì??ì?? (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
 msgstr "ë??ë?  ë?? ì ?í?¬ ë©?ì?¼ì?? ë¹?ì?¸ ìµ?ì?? ë? ì§? ê°?ê²©"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ë??ë?  ë?? í?´ì§?í?µì?? ë¹?ì?¸ ìµ?ì?? ë? ì§? ê°?ê²©"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "ë??ë?  ë?? í?´ì§?í?µì?? ë¹?ì?¸ ìµ?ì?? ì??ê°? ê°?ê²©."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ë??ë?  ë?? í?´ì§?í?µì?? ë¹?ì?¸ ìµ?ì?? ì??ê°? ê°?ê²©."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "ë°?ë?? ì?¬ë??/ì°¸ì¡°/ì?¨ì?? ì°¸ì¡°ì?? í??ì??í?  ì£¼ì??ì?? ê¸¸ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
 msgstr "ì ?ëª©ì?´ ì??ì?¼ë©´ ë¬¼ì?´ë³´ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ì?¬ì?©ì??ê°? í?´ë??ì?? ì§?ì?´ ë©?ì??ì§?ë¥¼ ë¹?ì?°ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ì ?ëª© ì??ë?? ë©?ì??ì§?ë¥¼ ë³´ë?´ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
 msgstr "ê²?ì?? í?´ë??ì??ì?? ë©?ì??ì§?ë¥¼ ì§?ì?¸ ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??ì?? ê°?ì?¸ í??ì? ì?? ê°?ë¡?ì±?ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Prompt when replying privately to list messages"
+msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ ë©?ì??ì§?ì?? ê°?ì?¸ í??ì? ì?? í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Prompt when replying to many recipients"
+msgstr "ë§?ì?? ì??ì? ì??ì??ê²? í??ì? í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
 msgstr "ì?¬ì?©ì??ê°? ì§?ì?´ ë©?ì??ì§?ë¥¼ ë¹?ì?°ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
 msgstr "Bccë§? ì?¬ì?©í??ì?? ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "10ê°? ì?´ì??ì?? ë©?ì??ì§?ë¥¼ ì?´ë ¤ê³  í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 "HTML ë©?ì??ì§?ë¥¼ ì??í??ì§? ì??ë?? ì?¬ë??í??í?? HTML ë©?ì?¼ì?? ë³´ë?´ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Toë?? Ccë¡? ë°?ë?? ì?¬ë??ì?´ ì??ë?? ì??í??ë¡? ë©?ì??ì§?ë¥¼ ë³´ë?´ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ì??í??ì§? ì??ë?? HTMLì?? ë³´ë?´ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
 msgstr "ì?¬ë?¬ ê°? ë©?ì??ì§?ì?? í??ì??í??ë ¤ í?  ë?? ë¬¼ì?´ë´?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
-msgstr "ë?µì?¥ ë§¨ ì??ì?? ê°?ì?¸ ì??ëª?ì?? ë?£ì?µë??ë?¤"
+msgstr "í??ì?  ë§¨ ì??ì?? ê°?ì?¸ ì??ëª?ì?? ë?£ì?µë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
-msgstr "ì»¤ì??ë¥¼ ë?µì?¥ ë§¨ ì??ë??ì?? ë??ì?µë??ë?¤"
+msgstr "ì»¤ì??ë¥¼ í??ì?  ë§¨ ì??ë??ì?? ë??ì?µë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "í??ì?¤í?¸ ì?¤ë§?ì?¼ë¦¬ë¥¼ ì?¸ì??í??ê³  ê·¸ë¦¼ì?¼ë¡? ë°?ê¿?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
 msgstr "í??ì?¤í?¸ì?? ë?¤ì?´ ì??ë?? ë§?í?¬ë¥¼ ì?¸ì??í??ê³  ë°?ê¿?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Run junk test on incoming mail."
 msgstr "ë°?ì?? ë©?ì?¼ì?? ë??í?´ ì ?í?¬ë©?ì?¼ ê²?ì?¬ë¥¼ ì?¤í??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
 msgstr "ì ?ì?¥ ë??ë ?í?°ë¦¬"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
 msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ì??ì?? ë³´ë?¸ ì?¬ë?? ì?¬ì§? ê²?ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
 msgstr "ê¸°ë³¸ì?¼ë¡? HTML ë©?ì?¼ ë³´ë?´ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
 msgstr "ê¸°ë³¸ì?¼ë¡? HTML ë©?ì?¼ì?? ë³´ë??ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
 msgstr "ë©?ì??ì§? ëª©ë¡?ì?? ë³´ë?¸ ì?¬ë?? ì ?ì??ë©?ì?¼ ì£¼ì?? ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
 msgstr "ì??ë²? ë??ê¸°í?? ì£¼ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr "ì°¸ì?´ë©´ ë©?ì?¼ì?? ì??ì?±í?  ë?? ì??ëª? ì??ì?? êµ¬ë¶?í??ë?? ë¬¸ì??ë¥¼ ì¶?ê°?í??ì§? ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ì?¨ì?? ì°¸ì¡°\" í??ë?? í??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ì°¸ì¡°\" í??ë?? í??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "ë?´ì?¤ê·¸ë£¹ì?? ê¸?ì?? ì?¸ ë?? \"ë³´ë?¸ ì?¬ë??\" í??ë?? í??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ë³´ë?¸ ì?¬ë??\" í??ë?? í??ì??"
-
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "ë?´ì?¤ê·¸ë£¹ì?? ê¸?ì?? ì?¸ ë?? \"í??ì?  ì£¼ì??\" í??ë?? í??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"í??ì?  ì£¼ì??\" í??ë?? í??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
 msgstr "ì? ë??ë©?ì?´ì?? ë³´ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
 msgstr "ëª¨ë?  ë©?ì??ì§? í?¤ë?? í??ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
 msgstr "ë©?ì??ì§?ë¥¼ ë³¼ ë?? ëª¨ë?  í?¤ë??ë¥¼ í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show animated images as animations."
 msgstr "ì? ë??ë©?ì?´ì??ì?´ ë?¤ì?´ ì??ë?? ê·¸ë¦¼ì?? ì? ë??ë©?ì?´ì??ì?¼ë¡? ë´?ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "ë©?ì??ì§? ëª©ë¡?ì?? ì?ì ?í?? ë©?ì??ì§?ë¥¼ í??ì??í?©ë??ë?¤ (ì·¨ì??ì? ì?? ê¸?ì?µë??ë?¤)."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
 msgstr "ë©?ì??ì§? ëª©ë¡?ì?? ì?ì ?í?? ë©?ì??ì§?ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
 msgstr "ê·¸ë¦¼ ì? ë??ë©?ì?´ì?? ë³´ê¸°"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
 msgstr "ì??ë??ì?? \"ë? ì§?\" í?¤ë?? ê°?ì?? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
 msgstr "ë³´ë?¸ ì?¬ë??ì?? ì?¬ì§?ì?? ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11983,7 +11931,7 @@ msgstr ""
 "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ì?¨ì?? ì°¸ì¡°\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë©?ì?¼ ê³?ì ?ì?´ "
 "ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11991,7 +11939,7 @@ msgstr ""
 "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ì°¸ì¡°\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë©?ì?¼ ê³?ì ?ì?´ ì??ì?? "
 "ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11999,15 +11947,7 @@ msgstr ""
 "ë?´ì?¤ê·¸ë£¹ì?? ê¸?ì?? ì?¸ ë?? \"ë³´ë?¸ ì?¬ë??\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë?´ì?¤ ê³?ì ?ì?´ "
 "ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"ë³´ë?¸ ì?¬ë??\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë©?ì?¼ ê³?ì ?ì?´ "
-"ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
-
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12015,7 +11955,7 @@ msgstr ""
 "ë?´ì?¤ê·¸ë£¹ì?? ê¸?ì?? ì?¸ ë?? \"í??ì?  ì£¼ì??\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë?´ì?¤ ê³?ì ?ì?´ "
 "ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12023,13 +11963,13 @@ msgstr ""
 "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? \"í??ì?  ì£¼ì??\" í??ë??ë¥¼ í??ì??í?©ë??ë?¤. ì?´ ì?µì??ì?? ë©?ì?¼ ê³?ì ?ì?´ "
 "ì??ì?? ë?? ë³´ê¸° ë©?ë?´ì??ì?? ì? í??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "ë©?ì??ì§? ëª©ë¡?ì?? ë³?ë?? ì?´ì?? ë³´ë?¸ ì?¬ë??ì?? ì ?ì??ë©?ì?¼ì?? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -12039,51 +11979,67 @@ msgstr ""
 "í??ì§? ì??ê°?ì?¼ë¡? í??ì??í?©ë??ë?¤.) ê±°ì§?ì?´ë©´ \"Date\" í?¤ë?? ê°?ì?? ì?¬ì?©ì??ê°? ì§?ì ?í?? í??ì??"
 "ê³¼ í??ì§? í??ì¤? ì??ê°?ë??ì?? ë§?ì¶° í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "ë©?ì??ì§? ì?½ê¸° ì°½ì??ì?? ë³´ë?¸ ì?¬ë??ì?? ì?¬ì§?ì?? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"ì?¼ë¶? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ë?? Reply-To: í?¤ë??ë¥¼ ë¶?ì?¬ì?? ì?¬ì?©ì??ê°? ê°?ì?¸ í??ì? ì?? í?  ê²½ì?°ì??"
+"ë?? ë¦¬ì?¤í?¸ë¡? í??ì? ì?? ë³´ë?´ë??ë¡? ì? ë??í?©ë??ë?¤. ì?´ ì?µì??ì?? ì°¸ì?¼ë¡? ì?¤ì ?í??ë©´ ê·¸ë?¬í?? "
+"Reply-To: í?¤ë??ë¥¼ ë¬´ì??í??ê³ , ì??ë??í?? ë??ë¡? ì??ë³¼ë£¨ì??ì?? ê¸°ë?¥ì?´ ë??ì??í?©ë??ë?¤. ê°?ì?¸ í??"
+"ì? ì?? í?  ê²½ì?°ë?? ê°?ì?¸ í??ì? ì?? í??ê³ , 'ë¦¬ì?¤í?¸ì?? í??ì? 'ì?? í?  ê²½ì?° ë¦¬ì?¤í?¸ì?? í??ì? ì?? í?©"
+"ë??ë?¤. ì?´ ê¸°ë?¥ì?? Reply-To: í?¤ë??ë¥¼ List-Post: í?¤ë??ì?? ë¹?êµ?í??ë?? ì??ì?¼ë¡? ë??ì??í?©ë??"
+"ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Spell check inline"
 msgstr "ë?´ì?¥ ë§?ì¶¤ë²? ê²?ì?¬"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
 msgstr "ë§?ì¶¤ë²? ê²?ì?¬ ì??"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Spell checking languages"
 msgstr "ë§?ì¶¤ë²? ê²?ì?¬ ì?¸ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Subscribe dialog default height"
 msgstr "êµ¬ë?? ë??í?? ì??ì?? ê¸°ë³¸ ë??ì?´"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Subscribe dialog default width"
 msgstr "êµ¬ë?? ë??í?? ì??ì?? ê¸°ë³¸ ë??ë¹?"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Terminal font"
 msgstr "í?°ë¯¸ë?? ê¸?ê¼´"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "í??ì?¤í?¸ ë©?ì??ì§? ìµ?ë?? í?¬ê¸°"
-
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "The default plugin for Junk hook"
 msgstr "ì ?í?¬ ë©?ì?¼ í??í?¬ì?? ë??í?? ê¸°ë³¸ í??ë?¬ê·¸ì?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "ë§?ì§?ë§?ì?¼ë¡? ì ?í?¬ ë©?ì?¼ì?? ë¹?ì?´ ì??ê°?, 1970ë?? 1ì?? 1ì?¼ë¶?í?° ì§?ë?? ë?  ì??."
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"ë§?ì§?ë§?ì?¼ë¡? ì ?í?¬ ë©?ì?¼ì?? ë¹?ì?´ ì??ê°?, 1970ë?? 1ì?? 1ì?¼ë¶?í?° (Epoch) ì§?ë?? ë?  ì??."
 
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "ë§?ì§?ë§?ì?¼ë¡? í?´ì§?í?µì?? ë¹?ì?´ ì??ê°?, 1970ë?? 1ì?? 1ì?¼ë¶?í?° ì§?ë?? ë?  ì??."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "ë§?ì§?ë§?ì?¼ë¡? í?´ì§?í?µì?? ë¹?ì?´ ì??ê°?, 1970ë?? 1ì?? 1ì?¼ë¶?í?° (Epoch) ì§?ë?? ë?  ì??."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -12094,30 +12050,32 @@ msgstr ""
 "\"0\"ì?? (ì ?í?µì ? ë°©ì??) ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë©?ì??ì§? ëª©ë¡? ì??ë??ì?? ë?¡ë??ë?¤. \"1\"ì?? (ì?¸"
 "ë¡? ë³´ê¸°) ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë©?ì??ì§? ëª©ë¡? ì??ì?? ë??ë??í?? ë?¡ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The terminal font for mail display."
 msgstr "ë©?ì?¼ì?? í??ì??í?  ë?? ì?¬ì?©í?  í?°ë¯¸ë?? ê¸?ê¼´."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "The variable width font for mail display."
 msgstr "ë©?ì?¼ì?? í??ì??í?  ë?? ì?¬ì?©í?  ê°?ë³?í? ê¸?ê¼´."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
 "ì?¸ ê°?ì§? ê°?ì?´ ê°?ë?¥í?©ë??ë?¤. \"0\"ì?? ì?¤ë¥?, \"1\"ì?? ê²½ê³ , \"2\"ë?? ë??ë²?ê¹? ë©?ì??ì§?."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"ì??ë³¼ë£¨ì??ì??ì?? í??ì??í?  ì?? ì??ë?? í??ì?¤í?¸ì?? ìµ?ë?? í?¬ê¸°ë¥¼ ì§?ì ?í?©ë??ë?¤. ê¸°ë³¸ê°?ì?? 4MB / "
-"4096 KBì?´ê³  KB ë?¨ì??ë¡? ì§?ì ?í?©ë??ë?¤."
+"ì??ë³¼ë£¨ì??ì??ì?? í??ì??í?  ì?? ì??ë?? ë©?ì??ì§? í??ì?¤í?¸ì?? ìµ?ë?? í?¬ê¸°ë¥¼ KB ë?¨ì??ë¡? ì§?ì ?í?©ë??"
+"ë?¤. ê¸°ë³¸ê°?ì?? 4096(4MB)ì??ë??ë?¤. ì?´ ê°?ì?? 'force_message_limit' í?¤ë¥¼ ì?¬ì?©í?  ê²½ì?°"
+"ì??ë§? ì?¬ì?©ë?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12127,7 +12085,7 @@ msgstr ""
 "ë?¤. ê¸°ë³¸ ëª©ë¡? í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í??ì§? ì??ë?? ê²½ì?°, ì?¬ì?© ê°?ë?¥í?? ë?¤ë¥¸ í??ë?¬ê·¸ì?¸ì?? ë??"
 "ì?  ì?¬ì?©í??ì§? ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -12135,7 +12093,7 @@ msgstr ""
 "ì?´ í?¤ë?? í?? ë²?ë§? ì?½ê³  ì?½ì?? ë?¤ì??ì?? ê±°ì§?ì?¼ë¡? ë?¤ì?? ì?¤ì ?ë?©ë??ë?¤. ëª©ë¡?ì??ì?? ë©?ì?¼ ì? í??"
 "ì?? ì ?ê±°í??ê³  ê·¸ í?´ë??ì?? ë??í?? ë¯¸ë¦¬ ë³´ê¸°ë¥¼ ì??ì?±ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12146,7 +12104,7 @@ msgstr ""
 "ì?¤í?¸ê°? ë?¤ì?´ ì??ì?µë??ë?¤. XML êµ¬ì¡°ì?? í??ì??ì?? &lt;header enabled&gt;ì??ë??ë?¤ - í?¤ë??"
 "ë¥¼ ë©?ì?¼ ë³´ê¸°ì??ì?? í??ì??í??ë©´ enabledë¡? ì?¤ì ?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -12156,11 +12114,11 @@ msgstr ""
 "ì??ë ¤ì§? ì?¬ë??ì?´ ë³´ë?¸ ë©?ì?¼ì?? ì ?ì?¸í?  ë??, ë¡?ì»¬ ì£¼ì??ë¡?ì??ì??ë§? ì£¼ì??ë¥¼ ì°¾ì?? ë³¼ì§? ì?¬ë¶?"
 "ë¥¼ ê²°ì ?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "This option would help in improving the speed of fetching."
 msgstr "ì?´ ì?µì??ì?¼ë¡? ê°?ì ¸ì?¤ê¸° ì??ë??ë¥¼ ë??ì?¼ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12168,7 +12126,7 @@ msgstr ""
 "ê¸°ë³¸ ë©?ì??ì§? ëª©ë¡? ë³´ê¸°ì??ì?? í??ì??í?  ì£¼ì??ì?? ê¸¸ì?´ë¥¼ ì§?ì ?í?©ë??ë?¤. ê¸¸ì?´ë¥¼ ë??ì?´ê°?ë©´ "
 "'...'ì?¼ë¡? í??ì??í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12176,7 +12134,7 @@ msgstr ""
 "ì?´ ì?¤ì ?ì?? ê¸°ë³¸ê°?ì?¼ë¡? ê¸?í??ë??ë¥¼ í??ì?¥ ì??í??ë¡? í? ì§? ì¶?ì?? ì??í??ë¡? í? ì§? ì§?ì ?í?©ë??ë?¤. "
 "ì??ë³¼ë£¨ì??ì?? ë?¤ì?? ì??ì??í?´ì?¼ í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -12185,81 +12143,81 @@ msgstr ""
 "ì?´ ì?¤ì ?ì?? í?´ë?¹ ê¸?í??ë??ì?? ìµ?ê·¼ ë©?ì??ì§?ë¥¼ ê¸°ì¤?ì?¼ë¡? ê¸?í??ë??ë¥¼ ì ?ë ¬í? ì§? ì?¬ë¶?ë¥¼ ì§?ì ?"
 "í?©ë??ë?¤. ì??ë³¼ë£¨ì??ì?? ë?¤ì?? ì??ì??í?´ì?¼ í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
 msgstr "ì ?ëª©ì?? ë?°ë?¼ ë©?ì??ì§? ëª©ë¡?ì?? ê¸?í??ë?? í??ì??í?©ë??ë?¤"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
 msgstr "ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í??ë?? ê²½ê³¼ ì??ê°?"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
 msgstr "ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í??ë?? ê²½ê³¼ ì??ê°?."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
 msgstr "ê¸°ë³¸ ê³?ì ?ì?? UID ë¬¸ì??ì?´."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ë?´ì?¥ ë§?ì¶¤ë²? ê²?ì?¬ë¥¼ ì?¬ì?©í?  ë?? ë§?ì¶¤ë²?ì?´ í??ë¦° ë?¨ì?´ì?? ë°?ì¤? ê·¸ì?? ì??."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
 msgstr "ì?¤í?¸ì?´ì??ì?  ë?°ëª¬ ë°? í?´ë?¼ì?´ì?¸í?¸ ì?¬ì?©"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ì?¤í?¸ì?´ì??ì?  ë?°ëª¬ ë°? í?´ë?¼ì?´ì?¸í?¸ë¥¼ (spamc/spamd) ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
 msgstr "ì?¬ì?©ì?? ì?¤ì ? ê¸?ê¼´ ì?¬ì?©"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
 msgstr "ë©?ì?¼ì?? í??ì??í?  ë?? ì?¬ì?©ì?? ì§?ì ? ê¸?ê¼´ì?? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
 msgstr "ë¡?ì»¬ ì?¤í?¸ í??ì?¤í?¸ë§? ì?¬ì?©í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ë¡?ì»¬ ì?¤í?¸ í??ì?¤í?¸ë§? ì?¬ì?©í?©ë??ë?¤ (DNSë?? ì?¬ì?©í??ì§? ì??ì?µë??ë?¤)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
-"ë©?ì?¸ì§?ì?? ë?µì?¥ì?? í?  ë?? ì»¤ì??ê°? ê°? ì??ì¹?. ì?´ ê°?ì?? ì»¤ì??ë¥¼ ë©?ì??ì§?ì?? ë§¨ ì??ì?? ë??ì??ì§? "
+"ë©?ì?¸ì§?ì?? í??ì? ì?? í?  ë?? ì»¤ì??ê°? ê°? ì??ì¹?. ì?´ ê°?ì?? ì»¤ì??ë¥¼ ë©?ì??ì§?ì?? ë§¨ ì??ì?? ë??ì??ì§? "
 "ë§¨ ì??ë??ì?? ë??ì??ì§? ê²°ì ?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
-"ë©?ì?¸ì§?ì?? ë?µì?¥ì?? í?  ë?? ì??ëª?ì?´ ê°? ì??ì¹?. ì?´ ê°?ì?? ì??ëª?ì?? ë©?ì??ì§?ì?? ë§¨ ì??ì?? ë??ì??ì§? "
+"ë©?ì?¸ì§?ì?? í??ì? ì?? í?  ë?? ì??ëª?ì?´ ê°? ì??ì¹?. ì?´ ê°?ì?? ì??ëª?ì?? ë©?ì??ì§?ì?? ë§¨ ì??ì?? ë??ì??ì§? "
 "ë§¨ ì??ë??ì?? ë??ì??ì§? ê²°ì ?í?©ë??ë?¤."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
 msgstr "ê°?ë³?í? ê¸?ê¼´"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "ê¸°ë³¸ê°?ì?¼ë¡? ë?´ì?© ì?½ì?? í??ì?¸ ì??ì²ì?? ëª¨ë?  ë©?ì??ì§?ì?? ì¶?ê°?í? ì§? ì?¬ë¶?."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ê°?ì?¥ì??ë¦¬ ì°½ì?? í?´ë?? ì?´ë¦?ì?? ë??í?´ ì¤?ì?¬ ì?°ê¸° ì?¬ì?©ì?? ë§?ì??ì§? ì?¬ë¶?."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12267,73 +12225,96 @@ msgstr ""
 "ë©?ì??ì§?ì?? In-Reply-To í?¹ì?? References í?¤ë??ê°? ì??ì?? ê²½ì?°ì?? ë??ì? ì?? ì ?ëª©ì?¼ë¡? ê¸?í??"
 "ë?? í??ì??ë¥¼ í?  ê²?ì?¸ì§? ì?¬ë¶?."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "í?´ë?¹ ê¸?í??ë??ì?? ìµ?ê·¼ ë©?ì??ì§?ë¥¼ ê¸°ì¤?ì?¼ë¡? ê¸?í??ë??ë¥¼ ì ?ë ¬í? ì§? ì?¬ë¶?"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+"í??í?°ë§?ì?? ë??ë?¸ í??ì?? ë³´ë?¸ í?¸ì§?í?¨ì?? í??ë?¬ì??í? ì§? ì?¬ë¶?. ë³´ë?¸ í?¸ì§?í?¨ í??ë?¬ì??ë?? 'ì ?"
+"ë?¬' í??í?° ë??ì??ì?? ì?¬ì?©í??ì?? ê²½ì?° ë°? ë§?ì§?ë§? ë??ì??ì?? ì?¤í??í?? í?? ì?½ 1ë¶? ë?¤ì?? ì?¼ì?´ë?©ë??"
+"ë?¤."
+
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Width of the message-list pane"
 msgstr "ë©?ì??ì§? ëª©ë¡? ì°½ì?? ë??ë¹?"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Width of the message-list pane."
 msgstr "ë©?ì??ì§? ëª©ë¡? ì°½ì?? ë??ë¹?."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "ELM ë?°ì?´í?° ê°?ì ¸ì?¤ê¸°"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
+#: ../modules/mail/e-mail-shell-view.c:964
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "ë©?ì?¼"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "ì??ë³¼ë£¨ì?? ELM ê°?ì ¸ì?¤ê¸°"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "ELMì??ì?? ë©?ì?¼ì?? ê°?ì ¸ì?µë??ë?¤."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "ë??ì?? í?´ë??:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+msgid "_Destination folder:"
+msgstr "ë??ì?? í?´ë??(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder"
 msgstr "í?´ë?? ì? í??"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
 msgstr "ì?´ë?? í?´ë??ë¡? ê°?ì ¸ì?¬ ì§? ì? í??í??ì?ì??ì?¤"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../mail/importers/evolution-mbox-importer.c:382
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "ì ?ëª©"
+
+#: ../mail/importers/evolution-mbox-importer.c:387
+msgctxt "mboxImp"
+msgid "From"
+msgstr "ë³´ë?¸ ì?¬ë??"
+
+#: ../mail/importers/evolution-mbox-importer.c:431
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "ë²?í?´ë¦¬ ë©?ì?¼ë°?ì?¤ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:432
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "ë²?í?´ë¦¬ ë©?ì?¼ë°?ì?¤ í??ì?? í?´ë?? ê°?ì ¸ì?¤ê¸°"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "ë©?ì?¼í?¨ ê°?ì ¸ì?¤ê¸°"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
 #, c-format
-msgid "Importing `%s'"
-msgstr "%s ê°?ì ¸ì?¤ë?? ì¤?ì??ë??ë?¤"
+msgid "Importing '%s'"
+msgstr "'%s' ê°?ì ¸ì?¤ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
 msgstr "%s ê²?ì??í??ë?? ì¤?ì??ë??ë?¤"
@@ -12342,475 +12323,552 @@ msgstr "%s ê²?ì??í??ë?? ì¤?ì??ë??ë?¤"
 msgid "Importing Pine data"
 msgstr "PINE ë?°ì?´í?° ê°?ì ¸ì?¤ê¸°"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:405
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "ì£¼ì??ë¡?"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
 msgstr "ì??ë³¼ë£¨ì?? PINE ê°?ì ¸ì?¤ê¸°"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "PINEì??ì?? ë©?ì?¼ì?? ê°?ì ¸ì?µë??ë?¤."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "%sì?? ë³´ë?´ë?? ë©?ì?¼"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "%sì??ì?? ì?¨ ë©?ì?¼"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "ì ?ëª©ì?´ %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ë©?ì?¼ë§? ë¦¬ì?¤í?¸"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "í??í?° ê·?ì¹? ì¶?ê°?"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(ì£¼ì??: í??ë¡?ê·¸ë?¨ì?? ë?¤ì?? ì??ì??í?´ì?¼ í?©ë??ë?¤)"
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * folder. For more than one filter rule is each of
+#. * them on a separate line, with four spaces in front
+#. * of its name, without quotes.
+#: ../mail/mail-autofilter.c:451
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"ë?¤ì?? í??í?° ê·?ì¹?:\n"
+"%s ê·?ì¹?ì?? ì??ë?°ì?´í?¸í??ì?µë??ë?¤. ì?´ ê·?ì¹?ì?? ë§? ì ?ê±°í?? ë?¤ì?? í?´ë??ë¥¼ ì?¬ì?©í??ì?µë??ë?¤:\n"
+"\"%s\""
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>ì??ì?? ì?°ê¸° ì?µì??</b> (ì¶?ì²?í??ì§? ì??ì??)"
+msgid "(Not Recommended)"
+msgstr "(ì¶?ì²?í??ì§? ì??ì??)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(ì£¼ì??: í??ë¡?ê·¸ë?¨ì?? ë?¤ì?? ì??ì??í?´ì?¼ í?©ë??ë?¤)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "ê³?ì ? ì ?ë³´"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "ì?? ì??ëª? ì¶?ê°?(_W)..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "ì?´ ê³?ì ?ì?¼ë¡? ë³´ë?´ë?? ë©?ì??ì§?ë?? í?ì?? ì??ëª?(_W)"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ì??í?¸í??í?? ë©?ì?¼ì?? ë³´ë?¼ ë?? ì??ì? ì?? ë??í?´ì??ë?? ì??í?¸í??(_F)"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "í?ì?? ì°¸ì¡°(CC) (_S):"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "í?ì?? ì?¨ì?? ì°¸ì¡°(BCC) (_B):"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ì??í?¸í??í?  ë?? ë?´ í?¤ ëª¨ì??ì?? ë?¤ì?´ ì??ë?? í?¤ë?? ì?¸ì ?ë?? ì? ë¢°(_T)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ì??í?¸í??í?? ë©?ì?¼ì?? ë³´ë?¼ ë?? ì??ì? ì?? ë??í?´ì?? ì?¸ì ?ë?? ì??í?¸í??(_M)"
 
 # read receipt -> ë?´ì?© ì?½ì?? í??ì?¸, Microsoft Office XP ì°¸ê³ 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "í?ì?? ë?´ì?© ì?½ì?? í??ì?¸ ì??ì²(_D)"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr "ëª¨ë?  í?´ë??ì?? ê°?ì?? ë³´ê¸° ì?¤ì ? ì ?ì?©(_V)"
+
+#: ../mail/mail-config.ui.h:16
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "ì?¸ì¦?"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "ì??ë??ì?¼ë¡? ì?´ëª¨í?°ì½? ê·¸ë¦¼ ë?£ê¸°(_E)"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "ë¬¸ì??ì??(_H):"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "ì§?ì??í??ë?? ë°©ì?? í??ì?¸(_E)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr "ì ?í?¬ ë©?ì?¼ ê²?ì?¬ì?? ì?¬ì?©ì?? ì§?ì ? í?¤ë?? ê²?ì?¬(_S)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "ë°?ì?? ë©?ì?¼ì?´ ì ?í?¬ ë©?ì?¼ì?¸ì§? ê²?ì?¬(_M)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "ì??ë ¥í?  ë?? ë§?ì¶¤ë²? ê²?ì?¬(_T)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "ë°?ë?? ë©?ì?¼ì?´ ì ?í?¬ë©?ì?¼ì?¸ ì§? ê²?ì?¬í?©ë??ë?¤"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "ì§?ì?°ê¸°(_A)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "ì§?ì?°ê¸°(_R)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "ë§?ì¶¤ë²?ì?´ í??ë¦° ê¸?ì??ì?? ì??(_M):"
 
 # ì§?í?? ì??í??ê°? ì??ë??ë?¼ ì?¤ì ? ì°½ì?? ì ?ëª©, "~í??ë?? ì¤?"ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "ë©?ì??ì§? ì??ì?±"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "ì?¤ì ?"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "í?´ë??ë¥¼ ë¹?ì?¸ ë?? í??ì?¸ ì§?ë¬¸(_W)"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "ê¸°ë³¸ ë??ì??"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "ê¸°ë³¸ ë¬¸ì?? ì?¸ì½?ë?©(_N):"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "ë©?ì?¼ ì?ì ?"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "ë??ë?  ë?? ì ?í?¬ ë©?ì?¼ ì?ì ?(_X)"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ë³´ë?´ë?? ë©?ì??ì§?ì?? (ê¸°ë³¸ê°?ì?¼ë¡?) ë??ì§?í?¸ ì??ëª?(_U)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "í??ì??í??ë?? ë©?ì??ì§? í?¤ë??(_H)"
+#: ../mail/mail-config.ui.h:39
+msgid "Displayed Message Headers"
+msgstr "í??ì??í??ë?? ë©?ì??ì§? í?¤ë??"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Do not format messages when text size exceeds" ____ "KB"
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "ë©?ì??ì§?ì?? í?¬ê¸°ê°? ë?¤ì??ì?? ë??ì?´ê°?ë©´ ë?´ì?© í??ì??í??ì§? ì??ê¸°(_Z): "
+#: ../mail/mail-config.ui.h:40
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "í??ì?¤í?¸ í?¬ê¸°ê°? ë?¤ì??ì?? ë??ì?´ê°?ë©´ ë©?ì??ì§? í??ì??í??ì§? ì??ê¸°(_Z): "
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "ë³´ë?¸ ì?¬ë??ì?´ ì£¼ì??ë¡?ì?? ë?¤ì?´ ì??ì?¼ë©´ ì ?í?¬ë©?ì?¼ë¡? í??ì??í??ì§? ì??ê¸°(_K)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "ì?¸ì?©í??ì§? ì??ê¸°"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "ì??ì?? ë³´ê´?í?¨ í?´ë??(_F):"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "ì ?ì??ë©?ì?¼ ì£¼ì??(_A):"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "ë??ë?  ë?? í?´ì§?í?µ í?´ë?? ë¹?ì?°ê¸°(_X): "
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "ë§?ë?¥ ì?¤í??ì?´ì?¤ë°? ì?¬ì?©(_P)"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "ê²?ì?? í?´ë?? ì?¬ì?©(_R)"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "ì??í?¸í?? ì?¸ì¦?ì??(_P):"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr "ë³´ë?´ë?? ë©?ì??ì§? ì??í?¸í?? (ê¸°ë³¸ê°?ì?¼ë¡?)(_G)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "ê³ ì ?í?(_X):"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "ê³ ì ?í? ê¸?ê¼´(_E):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "ê¸?ê¼´ ì??ì?±"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr "HTML í??ì?? ë©?ì??ì§?(_H)"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "ì ?ì²´ ì?´ë¦?(_E):"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "ê·¸ë£¹ í??ì? ì?? (ê°?ë?¥í?? ê²½ì?°) ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??ë§? í??ì? í?©ë??ë?¤"
+
+#: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
 msgstr "HTML ë©?ì??ì§?"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
 msgstr "HTTP í??ë¡?ì??(_T):"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "í?¤ë??"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "ì?¸ì?©ë¬¸ì?? ë?¤ì?? ì??ê¹?ë¡? í??ì??(_Q):"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:63
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??ì?? Reply-To: ë¬´ì??"
+
+#: ../mail/mail-config.ui.h:64
 msgid "Inline"
 msgstr "í?¬í?¨"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
 msgstr "í?¬í?¨ (Outlook ë°©ì??)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:67
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ë ?ì?´ë¸?"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:69
 msgid "Languages Table"
 msgstr "ì?¸ì?´ í??"
 
 # ì§?í?? ì??í??ê°? ì??ë??ë?¼ ì?¤ì ? ì°½ì?? ì ?ëª©, "~í??ë?? ì¤?"ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:70
 msgid "Loading Images"
 msgstr "ê·¸ë¦¼ ì?½ì?´ë?¤ì?´ê¸°"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:71
 msgid "Mail Headers Table"
 msgstr "ë©?ì?¼ í?¤ë?? í??"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:72
 msgid "Mailbox location"
 msgstr "ë©?ì?¼í?¨ ì??ì¹?"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Message Display"
 msgstr "ë©?ì??ì§? í??ì??"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Message Fonts"
 msgstr "ë©?ì??ì§? ê¸?ê¼´"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Message Receipts"
 msgstr "ë©?ì??ì§? ë?´ì?© ì?½ì?? í??ì?¸"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
 msgstr "í??ë¡?ì?? ì??ë?? í?¸ì?¤í?¸(_P):"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:78
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "ì??ë¦¼: ì²?ì?? ì?°ê²°í??ë©´ ì??í?¸ë¥¼ ë¬¼ì?´ë³´ë?? ì°½ì?´ ë?° ê²?ì??ë??ë?¤"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "ì?¬ì?©ì?? ì§?ì ? ì ?í?¬ ë©?ì?¼ í?¤ë??ê°? ì??ì?¼ë©´ ì?´ ì?µì??ì?? ë¬´ì??í?©ë??ë?¤."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "ì¶?ê°? ì ?ë³´"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "Or_ganization:"
 msgstr "ì¡°ì§?(_G):"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG í?¤ ID(_K):"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Pass_word:"
 msgstr "ì??í?¸(_W):"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Port:"
 msgstr "í?¬í?¸:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ì?¨ì?? ì°¸ì¡°ë¡?ë§? ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? í??ì?¸ ì§?ë¬¸(_O)"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Printed Fonts"
 msgstr "ì?¸ì?? ê¸?ê¼´"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
+msgid "Prompt when mailing list redirects private reply back to list"
+msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??ì?? ê°?ì?¸ í??ì? ì?? ë¦¬ì?¤í?¸ë¡? ë³´ë?¼ ë?? í??ì?¸ ì§?ë¬¸(_L)"
+
+#: ../mail/mail-config.ui.h:92
+msgid "Prompt when sending private replies to mailing _list messages"
+msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸ ë©?ì??ì§?ì?? ê°?ì?¸ í??ì? ì?? í?  ë?? í??ì?¸ ì§?ë¬¸(_L)"
+
+#: ../mail/mail-config.ui.h:93
+msgid "Prompt when sending replies to _many recipients"
+msgstr "ë§?ì?? ì??ì? ì??ì??ê²? í??ì? ì?? ë³´ë?¼ ë?? í??ì?¸ ì§?ë¬¸(_M)"
+
+#: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
 msgstr "í??ë¡?ì?? ì?¤ì ?"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:95
 msgid "Quoted"
 msgstr "ì?¸ì?©"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:96
 msgid "Re_member password"
 msgstr "ì??í?¸ ì ?ì?¥(_M)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:97
 msgid "Re_ply-To:"
 msgstr "í??ì?  ì£¼ì??(_P):"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:99
 msgid "Remember _password"
 msgstr "ì??í?¸ ì ?ì?¥(_P)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:100
 msgid "Required Information"
 msgstr "í??ì?? ì ?ë³´"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:101
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:102
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:103
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:104
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
 msgstr "ì?´ ì??ë³¼ë£¨ì?? ë¹?ë??ë?? SSLì?? ì§?ì??í??ì§? ì??ì?µë??ë?¤"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:107
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ì??ì??ë§? ë³´ë?¸ ì?¬ë??ì?? ì?¬ì§? ê²?ì??(_E)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:108
 msgid "S_elect..."
 msgstr "ì? í??(_E)..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:109
 msgid "S_end message receipts:"
 msgstr "ë©?ì??ì§? ì??ì?  í??ì?¸ ë³´ë?´ê¸°(_E):"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:110
 msgid "S_tandard Font:"
 msgstr "ì?¼ë°? ê¸?ê¼´(_T):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:111
 msgid "Secure MIME (S/MIME)"
 msgstr "ë³´ì?? MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:113
 msgid "Select Drafts Folder"
 msgstr "ê¸°ë³¸ í?´ë?? ì? í??"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:114
 msgid "Select HTML fixed width font"
 msgstr "HTML ê³ ì ?í? ê¸?ê¼´ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "ì?¸ì??ì?? ì?¬ì?©í?  HTML ê³ ì ?í? ê¸?ê¼´ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
 msgstr "HTML ê°?ë³?í? ê¸?ê¼´ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "ì?¸ì??ì?? ì?¬ì?©í?  HTML ê°?ë³?í? ê¸?ê¼´ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:118
+msgid "Select Junk Folder"
+msgstr "ì ?í?¬ë©?ì?¼ í?´ë?? ì? í??"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "ë³´ë?¸ í?¸ì§?í?¨ í?´ë?? ì? í??"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:120
+msgid "Select Trash Folder"
+msgstr "í?´ì§?í?µ í?´ë?? ì? í??"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "ë³´ë?´ë?? ì?¬ë?? ì?¬ì§?"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:122
 msgid "Sending Mail"
 msgstr "ë©?ì?¼ ë³´ë?´ê¸°"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:123
 msgid "Sent _Messages Folder:"
 msgstr "ë³´ë?¸ í?¸ì§?í?¨ í?´ë??(_M):"
 
 # ì§?í?? ì??í??ê°? ì??ë??ë?¼ ì?¤ì ? ì°½ì?? ì ?ëª©, "~í??ë?? ì¤?"ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:124
 msgid "Sent and Draft Messages"
 msgstr "ë³´ë?¸ ë©?ì??ì§? ë°? ì??ì?? ë©?ì??ì§?"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
 msgstr "ì??ë²?ì?? ì?¸ì¦?ì?´ í??ì??(_V)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
 msgstr "ì??ë²? ì?¤ì ?"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
 msgstr "ì??ë²? ì¢?ë¥?(_T):"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:128
+msgid "Si_gning algorithm:"
+msgstr "ì??ëª? ì??ê³ ë¦¬ì¦?(_G):"
+
+#: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
 msgstr "ì??ëª?(_N)"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
 msgstr "ì??ëª? ì?¸ì¦?ì??(_N):"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
 msgstr "ì??ëª?(_U):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:132
 msgid "Signatures"
 msgstr "ì??ëª?"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:133
+msgid "Signing _algorithm:"
+msgstr "ì??ëª? ì??ê³ ë¦¬ì¦?(_A):"
+
+#: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
 msgstr "ë§?ì¶¤ë²? ê²?ì?¬"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:135
 msgid "Start _typing at the bottom on replying"
-msgstr "ë?µì?¥í?  ë?? ë§¨ ì??ë??ë¶?í?° ì??ë ¥ ì??ì??(_T)"
+msgstr "í??ì? í?  ë?? ë§¨ ì??ë??ë¶?í?° ì??ë ¥ ì??ì??(_T)"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:137
 msgid "T_ype:"
 msgstr "ì¢?ë¥?(_Y):"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ì?´ ì?¸ì?´ ëª©ë¡?ì?? ì?¬ì ?ì?? ì?¤ì¹?í?? ì?¸ì?´ë§? ë?¤ì?´ ì??ì?µë??ë?¤."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12819,7 +12877,12 @@ msgstr ""
 "ë?¤ì?? ì?¤í?¬ë¦½í?¸ì?? ì¶?ë ¥ì?? ì??ëª?ì?¼ë¡? ì?¬ì?©í?©ë??ë?¤.\n"
 "ì§?ì ?í??ë?? ì?´ë¦?ì?? í??ì?? ëª©ì ?ì?¼ë¡?ë§? ì?´ì?©í?©ë??ë?¤."
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:143
+msgid "Top Posting Option"
+msgstr "ì??ì?? ì?°ê¸° ì?µì??"
+
+#: ../mail/mail-config.ui.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12827,190 +12890,200 @@ msgstr ""
 "ì?´ ê³?ì ?ì?? ì?¸ ì?´ë¦?ì?? ì??ë ¥í??ì?ì??ì?¤.\n"
 "ì??: \"ì??ì??ì?©\" ë??ë?? \"ê°?ì?¸ì?©\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:146
 msgid "Us_ername:"
 msgstr "ì?¬ì?©ì??ì?´ë¦?(_E):"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
 msgstr "ì?¸ì¦? ì?¬ì?©(_N)"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "ì?¬ì?©ì??ì?´ë¦?(_N):"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:149
 msgid "V_ariable-width:"
 msgstr "ê°?ë³?í?(_A):"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:150
 msgid "_Add Signature"
 msgstr "ì??ëª? ì¶?ê°?(_A)"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:151
 msgid "_Always load images from the Internet"
 msgstr "í?ì?? ì?¸í?°ë?·ì??ì?? ê·¸ë¦¼ ì?½ì?´ë?¤ì?´ê¸°(_A)"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:152
 msgid "_Authentication Type"
 msgstr "ì?¸ì¦? ë°©ë²?(_A)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
 msgstr "ê¸°ë³¸ ì ?í?¬ ë©?ì?¼ í??ë?¬ê·¸ì?¸(_D):"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:154
 msgid "_Direct connection to the Internet"
 msgstr "ì?¸í?°ë?·ì?? ì§?ì ? ì?°ê²°(_D)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:155
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ëª¨ì?? ì??ì²ì?? ì??ëª?í??ì§? ì??ê¸° (Outlook í?¸í??)(_D)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
 msgstr "ì ?ë?¬ ëª¨ì??(_F):"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:157
+msgid "_Junk Folder:"
+msgstr "ì ?í?¬ë©?ì?¼ í?´ë??(_J):"
+
+#: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
-msgstr "ë?µì?¥ì?? ì?¸ ë?? ì??ë¬¸ ì??ì?? ì??ëª? ë??ê¸°(_K)"
+msgstr "í??ì? ì?? ì?¸ ë?? ì??ë¬¸ ì??ì?? ì??ëª? ë??ê¸°(_K)"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:159
 msgid "_Languages"
 msgstr "ì?¸ì?´(_L)"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
 msgstr "ì£¼ì??ë¡?ì?? ì??ë?? ì?¬ë??ì?´ ë³´ë?¸ ë©?ì?¼ì?? ê·¸ë¦¼ ì?½ì?´ë?¤ì?´ê¸°(_L)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
 msgstr "ë¡?ì»¬ ì£¼ì??ë¡?ë§? ì°¾ì?? ë³´ê¸°(_L)"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:162
 msgid "_Make this my default account"
 msgstr "ë?´ ê¸°ë³¸ ê³?ì ?ì?¼ë¡? í??ê¸°(_M)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:163
 msgid "_Manual proxy configuration:"
 msgstr "ì??ë?? í??ë¡?ì?? ì?¤ì ?(_M):"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Mark messages as read after <seconds> seconds"
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:164
 msgid "_Mark messages as read after"
 msgstr "ë?¤ì?? ì??ê°?ì?´ ì§?ë??ë©´ ì?½ì?? ê²?ì?¼ë¡? í??ì??(_M):"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:166
 msgid "_Never load images from the Internet"
 msgstr "ê·¸ë¦¼ì?? ì?¸í?°ë?·ì??ì?? ì?½ì?´ë?¤ì?´ì§? ì??ê¸°(_N)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:167
 msgid "_Path:"
 msgstr "ê²½ë¡?(_P):"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:168
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML ë©?ì?¼ì?? ë°?ê³  ì?¶ì§? ì??ì?? ì?¬ë??í??í?? ë³´ë?¼ ë?? í??ì?¸ ì§?ë¬¸(_P)"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ì ?ëª©ì?´ ì??ì?´ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ë?? í??ì?¸ ì§?ë¬¸(_P)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
 msgstr "í??ì?  ëª¨ì??(_R):"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:171
 msgid "_Script:"
 msgstr "ì?¤í?¬ë¦½í?¸(_S):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:172
 msgid "_Secure HTTP Proxy:"
 msgstr "ë³´ì?? HTTP í??ë¡?ì??(_S):"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:174 ../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:157
+#: ../mail/mail-config.ui.h:176
 msgid "_Show image animations"
-msgstr "ê·¸ë¦¼ ì? ë??ë©?ì?´ì?? ë³´ê¸°(_S)"
+msgstr "ê·¸ë¦¼ ì? ë??ë©?ì?´ì?? ë³´ì?´ê¸°(_S)"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:177
 msgid "_Show the photograph of sender in the message preview"
-msgstr "ë©?ì?¼ ë¯¸ë¦¬ ë³´ê¸°ì??ì?? ë³´ë?¸ ì?¬ë??ì?? ì?¬ì§? ë³´ê¸°(_S)"
+msgstr "ë©?ì?¼ ë¯¸ë¦¬ ë³´ê¸°ì??ì?? ë³´ë?¸ ì?¬ë??ì?? ì?¬ì§? ë³´ì?´ê¸°(_S)"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Shrink To / Cc / Bcc headers to ____ addresses"
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:179
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ë°?ë?? ì?¬ë?? / ì°¸ì¡° / ì?¨ì?? ì°¸ì¡° í?¤ë?? ì¤?ì?´ê¸°(_S): "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:180
+msgid "_Trash Folder:"
+msgstr "í?´ì§?í?µ í?´ë??(_T):"
+
+#: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
 msgstr "ë³´ì?? ì?°ê²° ì?¬ì?©(_U):"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:182
 msgid "_Use system defaults"
 msgstr "ì??ì?¤í?? ê¸°ë³¸ê°? ì?¬ì?©(_U)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
 msgstr "ë?¤ë¥¸ í??ë¡?ê·¸ë?¨ê³¼ ê°?ì?? ê¸?ê¼´ ì?¬ì?©(_U)"
 
 # FIXME: wrong msgid - list model
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:186
 msgid "addresses"
 msgstr "ê°? ì£¼ì??"
 
 # FIXME: wrong msgid - list model
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:188
 msgid "color"
 msgstr "ì??ì??"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:189
 msgid "description"
 msgstr "ì?¤ëª?"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "ëª¨ë?  í??ì?±í??í?? ì??ê²© í?´ë??"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "ëª¨ë?  ë¡?ì»¬ í?´ë??ì?? í??ì?±í??í?? ì??ê²© í?´ë??"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "ëª¨ë?  ë¡?ì»¬ í?´ë??"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "í?¸ì¶?"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "ì??ë£?ë?¨(_M)"
 
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "ëª¨ë?? ì¤?ì?´ê¸°(_A)"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "ë??ì§?í?¸ ì??ëª?"
@@ -13020,58 +13093,66 @@ msgid "Do Not Forward"
 msgstr "ì ?ë?¬í??ì§? ì??ì??"
 
 #: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "ëª¨ë?? í?¼ì¹?ê¸°(_X)"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "ì??í?¸í??"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "í?´ë?? êµ¬ë??"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "ì¶?ê°? ì??ì??"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "ì? ì?©í?? ì ?ë³´"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "ì ?ë?¬"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "ì?¬ì?©ê¶? ì?½ê´?"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "í??ì? ì?´ í??ì?? ì??ì??"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "ì ?ì²´ í??ì? "
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "ë?¤ì?? ë³´ê¸°"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "ì??ë²?(_E):"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "ë?¤ì??ì?´ ë?¤ì?´ ì??ë?? í?ëª©ë§? í??ì??(_H):"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "í?´ë?? ì??ì?¤ ê²?ì??"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "ë³´ì?? ì ?ë³´"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "ì§?ì ?í?? í?´ë??"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13079,202 +13160,197 @@ msgstr ""
 "ë?¤ì??ì?? ì¶?ê°? ì??ì?? í??ë??ê·¸ë¥¼ í??ì??í??ë ¤ê³  ì? í??í?? ë©?ì??ì§?ì??ë??ë?¤.\n"
 "\"í??ë??ê·¸\" ë©?ë?´ì??ì?? ì¶?ê°? ì??ì?? ë??ì??ì?? ì? í??í??ì?ì??ì?¤."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "ì?¬ì?©ê¶? ë??ì??(_A)"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "ë§?ê°?(_D):"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "í??ì??(_F):"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "ì?¬ì?©ê¶? ì?½ê´?ì?? ë??ì??í??ì??ë©´ ì?¬ê¸°ì?? ì²´í?¬í??ì?ì??ì?¤(_T)"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:783
 #, c-format
 msgid "Pinging %s"
 msgstr "\"%s\" ì?°ê²°ì?? í??ì?¸í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "ì? í??í?? ë©?ì??ì§? í??í?°ë§?í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:245
 msgid "Fetching Mail"
 msgstr "ë©?ì?¼ ê°?ì ¸ì?¤ë?? ì¤?"
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:592
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ë??ê°?ë?? í??í?°ë¥¼ ì ?ì?©í??ë??ë?° ì?¤í?¨í??ì?µë??ë?¤: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "%sì?? ì¶?ê°?í??ë??ë?° ì?¤í?¨í??ì?µë??ë?¤: %s\n"
-"ë??ì? ì?? ë¡?ì»¬ì?? `ë³´ë?¸ í?¸ì§?í?¨'ì?? ì¶?ê°?í?©ë??ë?¤."
+"ë??ì? ì?? ë¡?ì»¬ì?? 'ë³´ë?¸ í?¸ì§?í?¨'ì?? ì¶?ê°?í?©ë??ë?¤."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:654
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ë¡?ì»¬ì?? 'ë³´ë?¸ í?¸ì§?í?¨' í?´ë??ì?? ì¶?ê°?í??ë??ë?° ì?¤í?¨í??ì?µë??ë?¤: %s"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "ë©?ì??ì§? ë³´ë?´ë?? ì¤?ì??ë??ë?¤"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:782
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$dê°? ì¤?ì??ì?? %1$dë²?ì§¸ ë©?ì??ì§?ë¥¼ ë³´ë?´ë?? ì¤?"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:826
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%2$dê°? ë©?ì??ì§? ì¤?ì??ì?? %1$dë²?ì§¸ë¥¼ ë³´ë?´ë??ë?° ì?¤í?¨í??ì?µë??ë?¤"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:783
 msgid "Canceled."
 msgstr "ì·¨ì??í?¨."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:785
 msgid "Complete."
 msgstr "ì??ë£?."
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "ë©?ì??ì§?ë¥¼ '%s' í?´ë??ì?? ì ?ì?¥í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "ë©?ì??ì§?ë?¤ì?? '%s'ì?? ì?®ê¸°ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "ë©?ì??ì§?ë?¤ì?? '%s'ì?? ë³µì?¬í??ë?? ì¤?"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1127
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "'%s'ì?? í?´ë??ë¥¼ ê²?ì?¬í??ë?? ì¤?"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1235
 msgid "Forwarded messages"
 msgstr "ì ?ë?¬í?? ë©?ì??ì§?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1276
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "'%s' í?´ë??ë¥¼ ì?¬ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "'%s' í?´ë??ì?? ì?©ë?? ì ?í?? ì ?ë³´ë¥¼ ê°?ì ¸ì?¤ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1414
 #, c-format
 msgid "Opening store '%s'"
 msgstr "'%s' ì ?ì?¥ê³ ë¥¼ ì?¬ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1485
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "'%s' í?´ë??ë¥¼ ì ?ê±°í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' í?´ë??ë¥¼ ì ?ì?¥í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1672
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ê³?ì ? '%s'ì?? ì§?ì?´ ë©?ì??ì§?ë¥¼ ë¹?ì?°ê³  ë?´ì?©ì?? ì ?ì?¥í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1673
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s ê³?ì ?ì?? ì ?ì?¥í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1727
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "'%s' í?´ë?? ì??ë¡? ê³ ì¹?ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1767
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "'%s' í?´ë??ì?? ì§?ì?´ ë©?ì??ì§?ë¥¼ ë¹?ì?°ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' ì??ì?? í?´ì§?í?µì?? ë¹?ì?°ë?? ì¤?"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1813
 msgid "Local Folders"
 msgstr "ë¡?ì»¬ í?´ë??"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ë©?ì??ì§? %dê°?ë¥¼ ê°?ì ¸ì?¤ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2105
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ë©?ì??ì§? %dê°?ë¥¼ ì ?ì?¥í??ë?? ì¤?"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2192
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"%s(ì?¼)ë¡? ë©?ì??ì§? ì ?ì?¥ ì¤? ì?¤ë¥? ë°?ì??:\n"
-" %s"
+msgid "Error saving messages to: %s:\n"
+msgstr "ë?¤ì??ì?¼ë¡? ë©?ì??ì§? ì ?ì?¥ ì¤? ì?¤ë¥? ë°?ì??:  %s:\n"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2265
 msgid "Saving attachment"
 msgstr "ì²¨ë¶? ì ?ì?¥"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13283,146 +13359,181 @@ msgstr ""
 "ì¶?ë ¥ í??ì?¼ì?? ë§?ë?¤ ì?? ì??ì??: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
-#, c-format
-msgid "Could not write data: %s"
-msgstr "ë?°ì?´í?°ë¥¼ ì?¸ ì?? ì??ì?µë??ë?¤: %s"
+#: ../mail/mail-ops.c:2310
+msgid "Could not write data: "
+msgstr "ë?°ì?´í?°ë¥¼ ì?¸ ì?? ì??ì?µë??ë?¤: "
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "'%s'ì??ì?? ì?°ê²° ë??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "'%s'ì?? ë?¤ì?? ì?°ê²°í??ë?? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2550
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' ì?°ê²° ì¤?ì§? ì??í?? ê³?ì ?ì?? ì¤?ë¹? ì¤?"
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2636
 msgid "Checking Service"
 msgstr "ì??ë¹?ì?¤ í??ì?¸ì¤?"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
 msgstr "ì·¨ì??í??ë?? ì¤?..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:440
 msgid "Send & Receive Mail"
 msgstr "ë©?ì?¼ ë³´ë?´ê³  ë°?ê¸°"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:457
 msgid "Cancel _All"
 msgstr "ëª¨ë?? ì·¨ì??(_A)"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
 msgstr "ì??ë?°ì?´í?¸ ì¤?..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
 msgid "Waiting..."
 msgstr "ê¸°ë?¤ë¦¬ë?? ì¤?..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:896
 #, c-format
 msgid "Checking for new mail"
 msgstr "ì?? ë©?ì?¼ í??ì?¸"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%sì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
 msgstr "ì??í?¸ ì??ë ¥"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%sì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
 msgid "Enter Password"
 msgstr "ì??í?¸ ì??ë ¥"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
 msgid "User canceled operation."
 msgstr "ì?¬ì?©ì??ê°? ì·¨ì??í?? ë??ì??."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:724
+#, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "ë??ì?? ì£¼ì??ë¥¼ ì??ë ¥í??ì§? ì??ì??ì?¼ë¯?ë¡? ë©?ì??ì§? ì ?ë?¬ì?? ì·¨ì??í?©ë??ë?¤."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:733
+#, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "ì?¬ì?©í?  ê³?ì ?ì?´ ì??ì?¼ë¯?ë¡? ë©?ì??ì§? ì ?ë?¬ì?? ì·¨ì??í?©ë??ë?¤."
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:128
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "ì?¤í?? ë??ë ?í?°ë¦¬ `%s'ì??(ë¥¼) ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "ì?¤í?? ë??ë ?í?°ë¦¬ '%s'ì??(ë¥¼) ë§?ë?¤ ì?? ì??ì?µë??ë?¤: %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:161
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "mboxê°? ì??ë?? ì??ì?¤ `%s'ì??ì?? ë©?ì?¼ ì?®ê¸°ê¸°ë¥¼ ì??ë??í??ì?µë??ë?¤"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "mboxê°? ì??ë?? ì??ì?¤ '%s'ì??ì?? ë©?ì?¼ ì?®ê¸°ê¸°ë¥¼ ì??ë??í??ì?µë??ë?¤"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ì ?ë?¬í?? ë©?ì??ì§? - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "ì ?ë?¬í?? ë©?ì??ì§?"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:318
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "ì??ëª»ë?? í?´ë??: `%s'"
+msgid "Invalid folder: '%s'"
+msgstr "ì??ëª»ë?? í?´ë??: '%s'"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "ê²?ì?? í?´ë?? ì?¤ì ?: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s'ì?? ë??í?? ê²?ì?? í?´ë??ë¥¼ ì??ë?°ì?´í?¸í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%sì?? ë??í?? ê²?ì?? í?´ë??ë¥¼ ì??ë?°ì?´í?¸í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../mail/mail-vfolder.c:675
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"ë?¤ì?? ê²?ì?? í?´ë??:\n"
+"%s í?´ë??ë¥¼ ì??ë?°ì?´í?¸í??ì?µë??ë?¤. ì?´ ê²?ì?? í?´ë??ë?? ë§? ì ?ê±°í?? ë?¤ì?? í?´ë??ë¥¼ ì?¬ì?©í??ì?µë??"
+"ë?¤:\n"
+"\"%s\""
+
+#: ../mail/mail-vfolder.c:1185
 msgid "Edit Search Folder"
 msgstr "ê²?ì?? í?´ë?? í?¸ì§?"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1290
 msgid "New Search Folder"
 msgstr "ì?? ê²?ì?? í?´ë??"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "\"ì ?í?¬ë©?ì?¼ ê²?ì?¬\" ì?¤í?¨"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "\"ì ?í?¬ë©?ì?¼ ì??ë¦¼\" ì?¤í?¨"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "\"ì ?í?¬ë©?ì?¼ ì??ë?? ì??ë¦¼\" ì?¤í?¨"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "\"{0}\"(ì?´)ë?¼ë?? ì?´ë¦?ì?? í?´ë??ê°? ì?´ë¯¸ ì??ì?µë??ë?¤. ë?¤ë¥¸ ì?´ë¦?ì?? ì?¬ì?©í??ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "\"{1}\"(ì?´)ë?¼ë?? ì?´ë¦?ì?? í?´ë??ê°? ì?´ë¯¸ ì??ì?µë??ë?¤. ë?¤ë¥¸ ì?´ë¦?ì?? ì?¬ì?©í??ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13434,7 +13545,7 @@ msgstr ""
 "ì?´ í?´ë??ë¥¼ ë¬´ì??í?  ì??ë?? ì??ê³ , ë?®ì?´ ì?°ê±°ë??, ê·¸ ë?´ì?© ë?¤ì?? ë?§ë¶?ì?´ê±°ë??, ë??ë?¼ ì?? ì??"
 "ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13442,13 +13553,13 @@ msgstr ""
 "\"{1}\"ì?? ë??í?´ ë?´ì?© ì?½ì?? í??ì?¸ì?? ì??ì²ë°?ì??ì?µë??ë?¤.  {0}ì??ê²? ë?´ì?© ì?½ì?? í??ì?¸ì?? ë³´"
 "ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "\"{1}\"(ì?´)ë?¼ë?? ì?´ë¦?ì?? ì??ëª?ì?´ ì?´ë¯¸ ì??ì?µë??ë?¤. ë?¤ë¥¸ ì?´ë¦?ì?? ì?¬ì?©í??ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13456,116 +13567,104 @@ msgstr ""
 "ë©?ì??ì§?ì?? ì??ë¯¸ì??ë?? ì ?ëª©ì?? ì?¨ì?¼ ë°?ë?? ì?¬ë??ì?´ ë©?ì?¼ì?´ ë¬´ì??ì?? ê´?í?? ë©?ì?¼ì?¸ì§? ì?? ì?? "
 "ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "ì ?ë§?ë¡? ì?´ ê³?ì ?ê³¼ ê·¸ í??ë¡?ì??ë¥¼ ëª¨ë?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "ì ?ë§?ë¡? ì?´ ê³?ì ?ì?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "ì ?ë§?ë¡? ì?´ ê³?ì ?ì?? ì?¬ì?©í??ì§? ì??ê³  ê·¸ í??ë¡?ì??ë¥¼ ëª¨ë?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "ì ?ë§?ë¡? {0}ê°?ì?? ë©?ì??ì§?ë¥¼ ë??ì??ì?? ì?¬ì??ê² ì?µë??ê¹??"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "ëª¨ë?  í?´ë??ì?? ì?ì ?í?? ë©?ì??ì§?ë¥¼ ì??ì ?í?? ì ?ê±°í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr "\"{0}\" í?´ë??ì?? ëª¨ë?  ì?ì ?í?? ë©?ì??ì§?ë¥¼ ì??ì ?í?? ì ?ê±°í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "ì ?ë§?ë¡? HTML í??ì??ì?? ë©?ì??ì§?ë¥¼ ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "ì ?ë§?ë¡? ë©?ì?¼ ì£¼ì??ê°? ì?¬ë°?ë¥´ì§? ì??ì?? ë©?ì??ì§?ë¥¼ ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "ì ?ë§?ë¡? ë©?ì?¼ ì£¼ì??ê°? ì?¬ë°?ë¥´ì§? ì??ì?? ë©?ì??ì§?ë¥¼ ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "ì ?ë§?ë¡? ë°?ë?? ì?¬ë??ì?´ BCCë§? ì??ë?? ë©?ì??ì§?ë¥¼ ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "ì ?ë§?ë¡? ì ?ëª© ì??ë?? ë©?ì??ì§?ë¥¼ ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "\"{0}\" ë??ë¬¸ì??ë??ë?¤."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "\"{2}\" ë??ë¬¸ì??ë??ë?¤."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "ì??ëª? ì??ì??"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "\"{0}\" ê²?ì?? í?´ë??ë¥¼ ì¶?ê°?í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" í?´ë??ë¥¼ \"{1}\"ì?? ë³µì?¬í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "\"{0}\" í?´ë??ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "ì??ì?? ì ?ì?¥ ë??ë ?í?°ë¦¬ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "\"{1}\" ë??ë¬¸ì?? ë??ë ?í?°ë¦¬ë¥¼ ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "\"{0}\" í?´ë??ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "\"{0}\" ì??ì?¤í?? í?´ë??ë¥¼ ì§?ì?¸ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "\"{0}\" ê²?ì?? í?´ë??ë¥¼ í?¸ì§?í?  ì?? ì??ì?µë??ë?¤: í?´ë??ê°? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" í?´ë??ë¥¼ \"{1}\"ì?? ì?®ê¸°ì§? ëª»í??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "\"{1}\" ì??ì?¤ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤"
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "\"{1}\" ì??ì?¤ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "\"{2}\" ì??ì?¤ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "\"{2}\" ë??ì??ì?? ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13573,35 +13672,31 @@ msgstr ""
 "\"{0}\" ë?¼ì?´ì? ì?¤ í??ì?¼ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤, ì?¤ì¹? ë¬¸ì ? ë??ë¬¸ì??ë??ë?¤. ì?´ ë?¼ì?´ì? ì?¤"
 "ì?? ë??ì??í??ê¸° ì ?ì??ë?? ì?´ ì ?ê³µì??ë¥¼ ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\"ì??(ë¥¼) \"{1}\"(ì?¼)ë¡? ì?´ë¦?ì?? ë°?ê¾¸ì§? ëª»í??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "\"{0}\" ì??ì?¤í?? í?´ë??ì?? ì?´ë¦?ì?? ë°?ê¾¸ê±°ë?? ì?®ê¸¸ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "ë°?ë?? ì?¬í?ì?? ê³?ì ?ì?? ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "\"{0}\" ë??ë ?í?°ë¦¬ì?? ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "\"{0}\" í??ì?¼ì?? ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "\"{0}\" ì??ëª? ì?¤í?¬ë¦½í?¸ë¥¼ ì?¤ì ?í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "ì ?í?¬ë©?ì?¼ ê²?ì?¬ ì?¤í?¨"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13609,118 +13704,121 @@ msgstr ""
 "ì??í?¸ë¥¼ ì ?í??í?? ì??ë ¥í?´ ì£¼ì?ì??ì?¤.  ë³´í?µ ì??í?¸ë?? ë??ì??ë¬¸ì??ë¥¼ êµ¬ë³?í?©ë??ë?¤. ì§?ê¸? Caps "
 "Lockì?´ ì¼?ì ¸ ì??ì?? ì??ë?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "ì??ëª? í??ì?¼ì?? ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "\"{0}\" ê²?ì?? í?´ë?? ì??ì?? ë©?ì??ì§?ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
+#: ../mail/mail.error.xml.h:46
+msgid "Do _Not Disable"
+msgstr "í?´ì ?í??ì§? ì??ê¸°(_N)"
+
 #: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "ì?ì ?í??ì§? ì??ê¸°(_E)"
+msgid "Do _Not Send"
+msgstr "ë³´ë?´ì§? ì??ê¸°(_N)"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "ì?ì ?í??ì§? ì??ê¸°"
+msgid "Do _Not Synchronize"
+msgstr "ë??ê¸°í??í??ì§? ì??ê¸°(_N)"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "í?´ì ?í??ì§? ì??ê¸°"
-
-#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "ì?°ê²° ì¤?ì§? ì??í?? ì?¬ì?©ì?´ë?¼ê³  í??ì??í?? í?´ë??ë¥¼ ë¡?ì»¬ì?? ë??ê¸°í??í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "ëª¨ë?  ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í? ê¹?ì???"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "ë°?ë?? ë?´ì?©ì?? ì ?ì?¥í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "í??í?° ì ?ì??ë¥¼ ì?½ì?´ë?¤ì?´ë??ë?° ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "ì??ì??ì?? ì??í??í??ë?? ì¤?ì?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "{0} ë??ì¤?ì?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "í??ì?¼ì?´ ì??ì§?ë§? ë?®ì?´ì?¸ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "í??ì?¼ì?´ ì??ì§?ë§? ì?¼ë°? í??ì?¼ì?´ ì??ë??ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "ê³?ì??í??ì??ë©´, ì?´ ë©?ì??ì§?ë¥¼ ë³µêµ¬í?  ì?? ì??ì?? ê²?ì??ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
 "ì?´ í?´ë??ë¥¼ ì?ì ?í??ë©´, ê·¸ ì??ì?? ì??ë?? ë?´ì?©ê³¼ ê·¸ í??ì?? í?´ë??ì?? ë?´ì?©ê¹?ì§? ì??ì??í?? ì?ì ?í??"
 "ê²? ë?©ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "ì?´ í?´ë??ë¥¼ ì?ì ?í??ë©´, ê·¸ ì??ì?? ì??ë?? ë?´ì?©ê¹?ì§? ì??ì??í?? ì?ì ?í??ê²? ë?©ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "ê³?ì??í??ì??ë©´, ëª¨ë?  í??ë¡?ì?? ê³?ì ?ì?? ì??ì??í?? ì?ì ?í?©ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr "ê³?ì?? í??ì??ë©´, ê³?ì ?ê³¼ ëª¨ë?  í??ë¡?ì??ì?? ì ?ë³´ë¥¼ ì??ì??í?? ì?ì ?í?©ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "ê³?ì?? í??ì??ë©´, ê³?ì ? ì ?ë³´ë¥¼ ì??ì??í?? ì?ì ?í?©ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "ë??ë?´ì??ë©´, ì??ë³¼ë£¨ì??ì?? ë?¤ì?? ì??ì??í?  ë??ê¹?ì§?ë?? ì?´ ë©?ì??ì§?ë¥¼ ë³´ë?´ì§? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "ë¬´ì??"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "ì?¸ì¦?ì?´ í??ë ¸ì?µë??ë?¤"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "ë©?ì?¼ ì?ì ?ê°? ì?¤í?¨í??ì?µë??ë?¤"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "ë©?ì?¼ í??í?°ë¥¼ ì??ë??ì?¼ë¡? ì??ë?°ì?´í?¸í??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 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 "
@@ -13732,27 +13830,27 @@ msgstr ""
 "ë?©ë??ë?¤. ì?´ë ?ê²? ë??ì§? ì??ì?¼ë ¤ë©´, ìµ?ì??í?? ì£¼ì??ë¥¼ í?? ê°?ë?¼ë?? \"ë°?ë?? ì?¬ë??:\"ì?´ë?? \"ì°¸"
 "ì¡°:\"ì?? ì?°ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "í?´ë??ê°? ë¹ ì¡?ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "ì??ì?¤ë¥¼ ì? í??í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "ì?¬ë?¬ ê°?ì?? ë©?ì??ì§?ë¥¼ í??êº¼ë²?ì?? ì?´ë©´ ì??ê°?ì?´ ì?¤ë?? ê±¸ë¦´ ì??ë?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "ê³?ì ? ì?¤ì ?ì?? í??ì?¸í??ê³  ë?¤ì?? ì??ë??í?´ ë³´ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "ê³?ì ?ì?? ì?¬ì?©í??ë??ë¡? ë§?ë?¤ê±°ë?? ë?¤ë¥¸ ê³?ì ?ì?¼ë¡? ë³´ë?´ ë³´ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 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."
@@ -13760,7 +13858,7 @@ msgstr ""
 "\"ë°?ë?? ì?¬ë??:\" í??ë??ì?? ì?¬ë°?ë¥¸ ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ ì??ë ¥í??ì?ì??ì?¤. ì??ë ¥ì°½ ì??ì?? \"ë°?"
 "ë?? ì?¬ë??:\" ë?¨ì¶?ë¥¼ ë??ë¥´ë©´ ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ ì°¾ì?? ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13770,65 +13868,60 @@ msgstr ""
 "ì?¤:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "ì?´ ì??ëª?ì?? êµ¬ë¶?í?  ì?? ì??ë?? ê³ ì? í?? ì?´ë¦?ì?? ì??ë ¥í??ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ê³¼ê±°ì?? \"{0}\" ë©?ì?¼ í?´ë??ì??ì?? ì?®ê²¨ì?¤ë??ë?° ë¬¸ì ?ê°? ë°?ì??í??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ì??ë²?ì?? ì§?ì??í??ë?? ì?¸ì¦? ë°©ì?? ëª©ë¡? ë¬¼ì?´ë³´ê¸°."
 
 # read receipt -> ë?´ì?© ì?½ì?? í??ì?¸, Microsoft Office XP ì°¸ê³ 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "ë?´ì?© ì?½ì?? í??ì?¸ì?? ì??ì²í??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ì ?ë§?ë¡? \"{0}\" í?´ë??ì?? ê·¸ ì??ë?? í?´ë??ë¥¼ ëª¨ë?? ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "ì ?ë§?ë¡? \"{0}\" í?´ë??ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "ì ?í?¬ë©?ì?¼ ì??ë¦¼ ì?¤í?¨"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "ì ?í?¬ë©?ì?¼ ì??ë?? ì??ë¦¼ ì?¤í?¨"
-
 #: ../mail/mail.error.xml.h:90
+msgid "Reply _Privately"
+msgstr "ê°?ì?¸ í??ì? (_P)"
+
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "ê²?ì?? í?´ë??ë¥¼ ì??ë??ì?¼ë¡? ì??ë?°ì?´í?¸í??ì?µë??ë?¤."
 
-# read receipt -> ë?´ì?© ì?½ì?? í??ì?¸, Microsoft Office XP ì°¸ê³ 
-#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "ë?´ì?© ì?½ì?? í??ì?¸ ë³´ë?´ê¸°"
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr "ê°?ì?¸ í??ì? ì?? ë³´ë?´ì??ê² ì?µë??ê¹??"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Send reply to all recipients?"
+msgstr "ëª¨ë?  ì??ì? ì??ì??ê²? í??ì? ì?? ë³´ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
 msgstr "ì??ëª?ì?´ ì?´ë¯¸ ì??ì?µë??ë?¤"
 
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "ë??ê¸°í??"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Synchronize folders locally for offline usage?"
 msgstr "ì?°ê²° ì¤?ì§? ì??í??ì??ì?? ì?¬ì?©í??ê¸° ì??í?´ í?´ë??ë¥¼ ë¡?ì»¬ì??ì?? ë??ê¸°í??í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13836,7 +13929,7 @@ msgstr ""
 "ì??ë³¼ë£¨ì??ì?´ ì ?ë??ë¡? ë??ì??í??ë ¤ë©´ ì??ì?¤í?? í?´ë??ê°? ì??ì?´ì?¼ í??ê³ , ì?´ í?´ë??ë?? ì?´ë¦?ì?? ë°?ê¾¸"
 "ê±°ë??, ì?®ê¸°ê±°ë??, ì?ì ?í??ë©´ ì?? ë?©ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13853,35 +13946,7 @@ msgstr ""
 "ë?©ë??ë?¤. ì?´ë ?ê²? ë??ì§? ì??ì?¼ë ¤ë©´, ìµ?ì??í?? ì£¼ì??ë¥¼ í?? ê°?ë?¼ë?? \"ë°?ë?? ì?¬ë??:\"ì?´ë?? \"ì°¸"
 "ì¡°:\"ì?? ì?°ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"ë?¤ì??:\n"
-"{0}\n"
-"ê²?ì?? í?´ë??ë?? ë?¤ì?? ì ?ê±°í?? í?´ë??ë¥¼ ì?¬ì?©í?©ë??ë?¤:\n"
-"    \"{1}\"\n"
-"ì??ë?°ì?´í?¸í??ì?µë??ë?¤."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"ë?¤ì??:\n"
-"{0}\n"
-"í??í?° ê·?ì¹?ì?? ë?¤ì?? ì ?ê±°í?? í?´ë??ë¥¼ ì?¬ì?©í?©ë??ë?¤:\n"
-"    \"{1}\"\n"
-"ì??ë?°ì?´í?¸í??ì?µë??ë?¤."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13889,7 +13954,7 @@ msgstr ""
 "ë°?ë?? ì?¬ë?? ì¤? ë?¤ì??ì?? ì?¬ë°?ë¥¸ ë©?ì?¼ ì£¼ì??ê°? ì??ë??ë??ë?¤:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13897,11 +13962,11 @@ msgstr ""
 "ë°?ë?? ì?¬ë?? ì¤? ë?¤ì??ì?? ì?¬ë°?ë¥¸ ë©?ì?¼ ì£¼ì??ê°? ì??ë??ë??ë?¤:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "ì?¤í?¬ë¦½í?¸ í??ì?¼ì?´ ì??ì?´ì?¼ í??ê³  ì?¤í??í?  ì?? ì??ì?´ì?¼ í?©ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13909,39 +13974,43 @@ msgstr ""
 "ì?´ í?´ë??ë?? ë¬µì??ì ?ì?¼ë¡? ì¶?ê°?í?? í?´ë??ì?¼ ì??ë?? ì??ì?µë??ë?¤.\n"
 "í??ì??í??ë?¤ë©´ ê²?ì?? í?´ë?? í?¸ì§? ì°½ì?¼ë¡? ê°?ì?? ì§?ì ? ì¶?ê°?í??ì?ì??ì?¤."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "ì§?ì ?í?? ê³?ì ?ì?? ì?¬ì?©í??ë?? ì¤?ì?´ ì??ë??ë¯?ë¡? ì?´ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "ë°?ë?? ì?¬ë??ì?? ì??ë¬´ë?? ì§?ì ?í??ì§? ì??ì??ì?? ì?´ ë©?ì??ì§?ë¥¼ ë³´ë?¼ ì?? ì??ì?µë??ë?¤"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
 "ì??ë²?ì??ì?? ì?´ ì?¸ì¦? ë°©ë²?ì?? ì§?ì??í??ì§? ì??ê³  ì?¸ì¦?ì?? ì ?í?? ì§?ì??í??ì§? ì??ë?? ê²? ê°?ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "ì??ëª?ì?´ ë°?ë??ì??ì§?ë§?, ì ?ì?¥í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "ì? í??í?? í?´ë??ì?? ê·¸ ì??ë?? í?´ë??ì?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:114
+msgid "This will mark all messages as read in the selected folder."
+msgstr "ì? í??í?? í?´ë??ì?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤."
+
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to connect to the GroupWise server."
 msgstr "ê·¸ë£¹ì??ì?´ì¦? ì??ë²?ì?? ì?°ê²°í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13949,19 +14018,19 @@ msgstr ""
 "ì?´ ê³?ì ?ì?? ì??ì?? ë³´ê´?í?¨ í?´ë??ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤. ë??ì?  ì??ì?¤í?? ì??ì?? ë³´ê´?í?¨ í?´ë??ë¥¼ "
 "ì?¬ì?©í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
 msgstr "ì?¬ì?©ê¶?í?? í??ì?¼ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
 msgstr "ê¸°ë³¸ê°? ì?¬ì?©(_D)"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
 msgstr "ê¸°ë³¸ ë³´ê´?í?¨ í?´ë??ë¥¼ ì?¬ì?©í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13971,31 +14040,57 @@ msgstr ""
 "ë¡? ì?ì ?í?©ë??ë?¤.\n"
 "ì ?ë§?ë¡? ë©?ì??ì§?ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+"ë©?ì?¼ë§? ë¦¬ì?¤í?¸ë¡? ë°?ì?? ë©?ì??ì§?ì?? ê°?ì?¸ í??ì? ì?? í??ë ¤ í??ì§?ë§?, ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??ì?? ë¦¬ì?¤"
+"í?¸ë¡? í??ì? í??ë??ë¡? ì ?í??ê³  ì??ì?µë??ë?¤. ì ?ë§?ë¡? ê³?ì?? í??ì??ê² ì?µë??ê¹??"
+
+#: ../mail/mail.error.xml.h:123
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+"ë©?ì?¼ë§? ë¦¬ì?¤í?¸ë¡? ë°?ì?? ë©?ì??ì§?ì?? í??ì? ì?? í??ë ¤ í??ì§?ë§?, ë©?ì?¼ë§? ë¦¬ì?¤í?¸ê°? ì??ë?? ë³´ë?¸ "
+"ì?¬ë??ì??ê²? ê°?ì?¸ í??ì? ì?? í??ë ¤ í?©ë??ë?¤. ì ?ë§?ë¡? ê³?ì?? í??ì??ê² ì?µë??ê¹??"
+
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"ë§?ì?? ì??ì? ì??ì??ê²? ë³´ë?´ë?? ë©?ì??ì§?ì?? í??ì? í?©ë??ë?¤. ì ?ë§?ë¡? \"ëª¨ë? \" ì??ì? ì??ì??ê²? í??ì? "
+"ì?? ë³´ë?´ì??ê² ì?µë??ê¹??"
+
+#: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ì?´ ë©?ì?¼ì?? ì§?ì?¸ ê¶?í??ì?´ ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "You have not filled in all of the required information."
 msgstr "í??ì??í?? ì ?ë³´ì¤?ì?? ì??ë ¥í??ì§? ì??ì?? ì ?ë³´ê°? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ë³´ë?´ì§? ì??ì?? ë©?ì??ì§?ê°? ì??ì?µë??ë?¤, ê·¸ë??ë?? ë??ë?´ì??ê² ì?µë??ê¹??"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
 msgstr "ê°?ì?? ì?´ë¦?ì?¼ë¡? ë?? ê°?ì?? ê³?ì ?ì?? ë§?ë?¤ ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
 msgstr "ì?´ ê²?ì?? í?´ë??ì?? ì?´ë¦?ì?? ì ?í?´ì?¼ í?©ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
 msgstr "í?´ë??ë¥¼ ì§?ì ?í?´ì?¼ í?©ë??ë?¤."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14005,116 +14100,123 @@ msgstr ""
 "í?´ë??ë¥¼ í??ë??ì?© ì? í??í??ì??ê±°ë??, ì??ë??ë©´ ëª¨ë?  ë¡?ì»¬ í?´ë??, ëª¨ë?  ì??ê²© í?´ë??, ì??ë??ë©´ ì ?"
 "ë¶?ë¥¼ ì? í??í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "\"{0}\" ì??ë²?ì?? \"{0}\" ì?¬ì?©ì??ë¡? ë¡?ê·¸ì?¸í??ë??ë?° ì?¤í?¨í??ì?µë??ë?¤."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "_Append"
 msgstr "ë?§ë¶?ì?´ê¸°(_A)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "ì?¬ì?© ì??ì??(_D)"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "ë°?ë?? ë?´ì?© ë²?ë¦¬ê¸°(_D)"
 
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "ë??ê¸°í??í??ì§? ì??ì??(_D)"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:137
+#: ../modules/mail/e-mail-shell-view-actions.c:887
 msgid "_Empty Trash"
 msgstr "í?´ì§?í?µ ë¹?ì?°ê¸°(_E)"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
 msgstr "ì??ì ?í?? ì?ì ?(_E)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Open Messages"
 msgstr "ë©?ì??ì§? ì?´ê¸°(_O)"
 
-#: ../mail/message-list.c:1122
+# read receipt -> ë?´ì?© ì?½ì?? í??ì?¸, Microsoft Office XP ì°¸ê³ 
+#: ../mail/mail.error.xml.h:142
+msgid "_Send Receipt"
+msgstr "ë?´ì?© ì?½ì?? í??ì?¸ ë³´ë?´ê¸°(_S)"
+
+#: ../mail/mail.error.xml.h:143
+msgid "_Synchronize"
+msgstr "ë??ê¸°í??(_S)"
+
+#: ../mail/message-list.c:1170
 msgid "Unseen"
 msgstr "ë³´ì§?ì??ì??ì??"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1171
 msgid "Seen"
 msgstr "ë´¤ì??"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1172
 msgid "Answered"
 msgstr "ì??ë?µí?¨"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1173
 msgid "Forwarded"
 msgstr "ì ?ë?¬í?¨"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1174
 msgid "Multiple Unseen Messages"
 msgstr "ì?¬ë?¬ê°?ì?? ë³´ì§?ì??ì?? ë©?ì??ì§?"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1175
 msgid "Multiple Messages"
 msgstr "ì?¬ë?¬ ë©?ì??ì§?"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1179
 msgid "Lowest"
 msgstr "ê°?ì?¥ ë?®ì??"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1180
 msgid "Lower"
 msgstr "ë?®ì??"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1184
 msgid "Higher"
 msgstr "ë??ì??"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1185
 msgid "Highest"
 msgstr "ê°?ì?¥ ë??ì??"
 
 # ???
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ì?¤ë?? %p %l:%M"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1811
 msgid "Yesterday %l:%M %p"
 msgstr "ì?´ì ? %p %l:%M "
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
 msgstr "(%a) %p %l:%M"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1831
 msgid "%b %d %l:%M %p"
-msgstr "%b %eì?¼ %p %l:%M"
+msgstr "%b %dì?¼ %p %l:%M"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1833
 msgid "%b %d %Y"
-msgstr "%Yë?? %b %eì?¼"
+msgstr "%Yë?? %b %dì?¼"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2598
 msgid "Select all visible messages"
 msgstr "ëª¨ë?  ë³´ì?´ë?? ë©?ì??ì§? ì? í??"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "ì?¸ ë°±ì??ë??"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
 msgid "Generating message list"
 msgstr "ë©?ì??ì§? ëª©ë¡? ì??ì?±ì¤?"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4643
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14122,15 +14224,7 @@ msgstr ""
 "ê²?ì?? ê¸°ì¤?ì?? í?´ë?¹í??ë?? ë©?ì??ì§?ê°? ì??ì?µë??ë?¤. ê²?ì??->ì§?ì?°ê¸° ë©?ë?´ í?ëª©ì?¼ë¡? ì°¾ê¸°ë¥¼ ì§?"
 "ì?°ê±°ë?? ê²?ì?? ê¸°ì¤?ì?? ë°?ê¾¸ì?ì??ì?¤."
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"ì?´ í?´ë??ì??ë?? ì?¨ê¸´ ë©?ì??ì§?ê°? ì??ì?µë??ë?¤. ì?´ ë©?ì??ì§?ë¥¼ í??ì??í??ë ¤ë©´ ë³´ê¸°->ì?¨ê¸´ ë©?ì??ì§? "
-"í??ì?? ì?µì??ì?? ì?¬ì?©í??ì?ì??ì?¤."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4645
 msgid "There are no messages in this folder."
 msgstr "ì?´ í?´ë??ì??ë?? ë©?ì??ì§?ê°? ì??ì?µë??ë?¤."
 
@@ -14159,7 +14253,7 @@ msgid "Sent Messages"
 msgstr "ë³´ë?¸ ë©?ì??ì§?"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:570
 msgid "Size"
 msgstr "í?¬ê¸°"
 
@@ -14169,27 +14263,27 @@ msgstr "ì ?ëª© - ì??ë¦?"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Body contains"
 msgstr "ë³¸ë¬¸ì?? í?¬í?¨"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Message contains"
 msgstr "ë©?ì??ì§?ì?? í?¬í?¨"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Recipients contain"
 msgstr "ë°?ë?? ì?¬ë??ì?? í?¬í?¨"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Sender contains"
 msgstr "ë³´ë?¸ ì?¬ë??ì?? í?¬í?¨"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "Subject contains"
 msgstr "ì ?ëª©ì?? í?¬í?¨"
 
@@ -14222,15 +14316,15 @@ msgstr ""
 "ì?´ ì?µì??ì?? ì? í??í??ë©´ ì??ë²?ì??ì?? SSLì?? ì§?ì??í??ì§? ì??ë??ë?¤ë?? ì??ë¯¸ì??ë??ë?¤.  ì?°ê²°ì?´ ì??ì ?"
 "í??ì§? ì??ì?? ì??ë?? ì??ê³ , ë³´ì??ì??ì?? ì¹¨í?¬ì?? ì·¨ì?½í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "ì??ì?¼ ë°? ê¸°ë??ì?¼ ë?¬ë ¥ì??ì?? ì?¬ì?©(_B)"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "ì??ì?¼ ë°? ê¸°ë??ì?¼ ë?¬ë ¥ì??ì?? ì?¬ì?©(_S)"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "ì?°ê²° ì¤?ì§? ì??í?? ì??ì??ì?? ì??í?´ ì£¼ì??ë¡? ë?´ì?© ë¡?ì»¬ì?? ë³µì?¬(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -14239,7 +14333,7 @@ msgstr ""
 "ì??ë³¼ë£¨ì??ì??ì?? ì?°ê²°í?  LDAP ì??ë²?ì?? í?¬í?¸ ë²?í?¸ì??ë??ë?¤. í??ì¤? í?¬í?¸ ë²?í?¸ì?? ëª©ë¡?ì?´ ì?¬"
 "ê¸° ì??ì?µë??ë?¤. ì?´ë?¤ í?¬í?¸ë¥¼ ì§?ì ?í?´ì?¼ í?  ì§?ë?? ì??ì?¤í?? ê´?ë¦¬ì??ì??ê²? ë¬¼ì?´ë³´ì?ì??ì?¤."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14248,7 +14342,7 @@ msgstr ""
 "ì??ë³¼ë£¨ì??ì??ì?? ì?¸ì¦?í??ë?? ë°©ë²?ì??ë??ë?¤. \"ì ?ì??ë©?ì?¼ ì£¼ì??\"ë¡? ì?¤ì ?í??ë©´ ë°?ë??ì?? LDAP ì??"
 "ë²?ì?? ì?µëª? ì ?ê·¼ì?´ ê°?ë?¥í?´ì?¼ í?©ë??ë?¤."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -14259,31 +14353,31 @@ msgstr ""
 "ê²?ì?? ë²?ì??ë?? ê²?ì?? ê¸°ì¤? ì??ë??ì?? ëª¨ë?  ì??í?¸ë¦¬ì?? ë??í?´ì?? ì°¾ê²? ë?©ë??ë?¤. ê²?ì?? ë²?ì??ê°? "
 "\"í?? ë?¨ê³?\"ì?´ë©´ ê²?ì?? ê¸°ì¤?ì??ì?? í?? ë?¨ê³? ì??ë??ì?? ì??í?¸ë¦¬ë§? í?¬í?¨í?©ë??ë?¤."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "ì??ë²? ì ?ë³´"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ì??ì?¸í??"
 
 # ì§?í?? ì??í??ê°? ì??ë??ë?¼ ì?¤ì ? ì°½ì?? ì ?ëª©, "~í??ë?? ì¤?"ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "ê²?ì??"
 
 # ì§?í?? ì??í??ê°? ì??ë??ë?¼ ì?¤ì ? ì°½ì?? ì ?ëª©, "~í??ë?? ì¤?"ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "ë?¤ì?´ë¡?ë??"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "ì£¼ì??ë¡? ì??ì?±"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "ì?? ì£¼ì??ë¡?"
 
@@ -14362,499 +14456,393 @@ msgstr "ë©?ì?¼ ì£¼ì??ë¥¼ ì??ë?? ì??ì?±í?? ì?´ë¦?ê³¼ ê°?ì?´ ì??ë ¥ì°½ì?? í??ì??
 msgid "Whether to show the preview pane."
 msgstr "ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë³¼ì§? ì?¬ë¶?."
 
-#: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-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:162
+#: ../modules/mail/em-mailer-prefs.c:1141
+msgid "_Table column:"
+msgstr "í??ì?´ë¸? ì?´(_T):"
+
+#: ../modules/addressbook/autocompletion-config.c:165
 msgid "Autocompletion"
 msgstr "ì??ë?? ì??ì?±"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Always _show address of the autocompleted contact"
 msgstr "í?ì?? ì£¼ì??ë¡?ì??ì?? ì??ë?? ì??ì?±í?? ë©?ì?¼ ì£¼ì??ë¥¼ í??ì??(_S)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "LDAP ì??ë²?"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "_Contact"
 msgstr "ì?°ë?½ì²?(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "ì??ë¡?ì?´ ì?°ë?½ì²?ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:287
 msgctxt "New"
 msgid "Contact _List"
 msgstr "ì?°ë?½ì²? ëª©ë¡?(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "ì?? ì?°ë?½ì²? ëª©ë¡?ì?? ë§?ë?ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:297
 msgctxt "New"
 msgid "Address _Book"
 msgstr "ì£¼ì??ë¡?(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "ì?? ì£¼ì??ë¡?ì?? ë§?ë?ë??ë?¤"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-view.c:401
+#: ../modules/calendar/e-cal-shell-backend.c:104
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "ì?°ë?½ì²?"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "ì??ì?¤ ëª©ë¡?"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "ì£¼ì??ë¡? ì ?ì?¥"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "í??ì?¬ ë³´ê¸°"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "í??ì?¬ ì? í??í?? ì£¼ì??ë¡? ë³´ê¸°"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "ë¯¸ë¦¬ ë³´ê¸° ì?°ë?½ì²?"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "ë¯¸ë¦¬ ë³´ê¸° ì°½ì??ì?? í??ì?? ì¤?ì?¸ ì?°ë?½ì²?"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "ë¯¸ë¦¬ ë³´ê¸° í??ì??"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? í??ì??í? ì§? ì?¬ë¶?"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP ì??ë²?"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "ì??ë?? ì??ì?± ì?¤ì ?"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ì??ë³¼ë£¨ì?? ì?°ë?½ì²? í?´ë??ì?? ì??ì¹?ì?? êµ¬ì¡°ê°? ì??ë³¼ë£¨ì?? 1.xì?? ë?¤ë¥´ê²? ë°?ë??ì??ì?µë??ë?¤.\n"
-"\n"
-"í?´ë??ë¥¼ ì?®ê¸°ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ë©?ì?¼ë§? ë¦¬ì?¤í?¸ ì?°ë?½ì²?ì?? í??ì??ì?´ ë°?ë??ì??ì?µë??ë?¤.\n"
-"\n"
-"í?´ë??ë¥¼ ì?¬ê¸°ì?? ë§?ê²? ë³?í??í??ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ì??ë³¼ë£¨ì??ì??ì?? ì ?í??ë²?í?¸ë¥¼ ì ?ì?¥í??ë?? ë°©ë²?ì?´ ë?¤ë¥´ê²? ë°?ë??ì??ì?µë??ë?¤.\n"
-"\n"
-"í?´ë??ë¥¼ ì?¬ê¸°ì?? ë§?ê²? ë³?í??í??ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"ì??ë³¼ë£¨ì??ì?? Palm Sync ë³?ê²½ë¡?ê·¸ ë°? ë§µ í??ì?¼ì?´ ë°©ì??ì?´ ë?¤ë¥´ê²? ë°?ë??ì??ì?µë??ë?¤.\n"
-"\n"
-"í?´ë??ë¥¼ ì?¬ê¸°ì?? ë§?ê²? ë³?í??í??ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "ì??ì?¤ ì? í?? ì??ì ¯"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "ì?´ ì??ì ¯ì?? ì£¼ì??ë¡? ëª¨ì??ì?? í??ì??í?©ë??ë?¤"
+#: ../modules/addressbook/e-book-shell-backend.c:325
+msgid "Certificates"
+msgstr "ì?¸ì¦?ì??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:549
 msgid "Save as vCard"
 msgstr "vCard í??ì??ì?¼ë¡? ì ?ì?¥"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Co_py All Contacts To..."
 msgstr "ëª¨ë?  ì?°ë?½ì²? ë³µì?¬(_P)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Copy the contacts of the selected address book to another"
 msgstr "ì? í??í?? ì£¼ì??ë¡?ì?? ì?°ë?½ì²?ë¥¼ ë?¤ë¥¸ ì£¼ì??ë¡?ì?? ë³µì?¬í?©ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "D_elete Address Book"
 msgstr "ì£¼ì??ë¡? ì?ì ?(_E)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
 msgid "Delete the selected address book"
 msgstr "ì? í??í?? ì£¼ì??ë¡?ì?? ì?ì ?í?©ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Mo_ve All Contacts To..."
 msgstr "ëª¨ë?  ì?°ë?½ì²? ì?´ë??(_V)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
 msgid "Move the contacts of the selected address book to another"
 msgstr "ì? í??í?? ì£¼ì??ë¡?ì?? ì?°ë?½ì²?ë¥¼ ë?¤ë¥¸ ì£¼ì??ë¡?ì?¼ë¡? ì?®ê¹?ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "_New Address Book"
 msgstr "ì?? ì£¼ì??ë¡?(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Address _Book Properties"
 msgstr "ì£¼ì??ë¡? ì??ì?±(_B)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
 msgid "Show properties of the selected address book"
 msgstr "ì? í??í?? ì£¼ì??ë¡?ì?? ì??ì?±ì?? ë´?ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "_Rename..."
 msgstr "ì?´ë¦? ë°?ê¾¸ê¸°(_R)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
 msgid "Rename the selected address book"
 msgstr "ì? í??í?? ì£¼ì??ë¡? ì?´ë¦?ì?? ë°?ê¿?ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "S_ave Address Book as vCard"
 msgstr "ì£¼ì??ë¡?ì?? VCard í??ì??ì?¼ë¡? ì ?ì?¥(_A)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "ì? í??í?? ì£¼ì??ë¡?ì?? ì?°ë?½ì²?ë¥¼ VCard í??ì??ì?¼ë¡? ì ?ì?¥í?©ë??ë?¤"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Stop loading"
 msgstr "ì?½ì?´ë?¤ì?´ê¸°ë¥¼ ì¤?ì§?í?©ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Copy Contact To..."
 msgstr "ì?°ë?½ì²? ë³µì?¬(_C)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Copy selected contacts to another address book"
 msgstr "ì? í??í?? ì?°ë?½ì²?ë¥¼ ë?¤ë¥¸ ì£¼ì??ë¡?ì?? ë³µì?¬í?©ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "_Delete Contact"
 msgstr "ì?°ë?½ì²? ì?ì ?(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Find in Contact..."
 msgstr "ì?°ë?½ì²?ì??ì?? ì°¾ê¸°(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Search for text in the displayed contact"
 msgstr "í??ì??í?? ì?°ë?½ì²?ì??ì?? í??ì?¤í?¸ë¥¼ ì°¾ì?µë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Forward Contact..."
 msgstr "ì?°ë?½ì²? ì ?ë?¬(_F)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
 msgid "Send selected contacts to another person"
 msgstr "ì? í??í?? ì?°ë?½ì²?ë¥¼ ë?¤ë¥¸ ì?¬ë??ì??ê²? ë³´ë??ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_Move Contact To..."
 msgstr "ì?°ë?½ì²? ì?´ë??(_M)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Move selected contacts to another address book"
 msgstr "ì? í??í?? ì?°ë?½ì²?ë¥¼ ë?¤ë¥¸ ì£¼ì??ë¡?ì?? ì?®ê¹?ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "_New Contact..."
 msgstr "ì?? ì?°ë?½ì²?(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "New Contact _List..."
 msgstr "ì?? ì?°ë?½ì²? ëª©ë¡?(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Open Contact"
 msgstr "ì?°ë?½ì²? ì?´ê¸°(_O)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
 msgid "View the current contact"
 msgstr "í??ì?¬ ì?°ë?½ì²?ë¥¼ ë´?ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 msgid "_Send Message to Contact..."
 msgstr "ì?°ë?½ì²?ë¡? ë©?ì??ì§? ë³´ë?´ê¸°(_S)..."
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
 msgid "Send a message to the selected contacts"
 msgstr "ì? í??í?? ì?°ë?½ì²?ë¡? ë©?ì??ì§?ë¥¼ ë³´ë??ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "ë??ì??(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "_Preview"
 msgstr "ë¯¸ë¦¬ ë³´ê¸°(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:817
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "ì?ì ?(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "_Properties"
 msgstr "ì??ì?±(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_Save as vCard..."
 msgstr "vCardë¡? ì ?ì?¥(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
 msgid "Contact _Preview"
 msgstr "ì?°ë?½ì²? ë¯¸ë¦¬ ë³´ê¸°(_P)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
 msgid "Show contact preview window"
 msgstr "ì?°ë?½ì²? ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ë´?ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "_Classic View"
 msgstr "ì ?í?µì ?ì?¼ë¡? ë³´ê¸°(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "Show contact preview below the contact list"
 msgstr "ì?°ë?½ì²? ëª©ë¡? ì??ë??ì?? ì?°ë?½ì²? ë¯¸ë¦¬ ë³´ê¸°ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../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:1195
 msgid "_Vertical View"
 msgstr "ì?¸ë¡?ë¡? ë³´ê¸°(_V)"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "Show contact preview alongside the contact list"
 msgstr "ì?°ë?½ì²? ëª©ë¡?ê³¼ ë??ë??í?? ì?°ë?½ì²? ë¯¸ë¦¬ ë³´ê¸°ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "ëª¨ë?  ë¶?ë¥?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "ë§?ì§? ì??ì??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../shell/e-shell-content.c:467
 msgid "Advanced Search"
 msgstr "ê³ ê¸? ê²?ì??"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Print all shown contacts"
 msgstr "í??ì??ë?? ëª¨ë?  ì?°ë?½ì²?ë¥¼ ì?¸ì??í?©ë??ë?¤"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Preview the contacts to be printed"
 msgstr "ì?¸ì??í?  ì?°ë?½ì²?ë¥¼ ë¯¸ë¦¬ ë´?ë??ë?¤"
 
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Print selected contacts"
 msgstr "ì? í??í?? ì?°ë?½ì²?ë¥¼ ì?¸ì??í?©ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "vCardë¡? ì ?ì?¥..."
-
 # tooltip
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Save selected contacts as a vCard"
 msgstr "ì? í??í?? ì?°ë?½ì²?ë¥¼ VCard í??ì??ì?¼ë¡? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Forward Contacts"
 msgstr "ì?°ë?½ì²? ì ?ë?¬(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Forward Contact"
 msgstr "ì?°ë?½ì²? ì ?ë?¬(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:378
 msgid "_Send Message to Contacts"
 msgstr "ë©?ì??ì§?ë¥¼ ì?°ë?½ì²?ì?? ë³´ë?´ê¸°(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:380
 msgid "_Send Message to List"
 msgstr "ë©?ì??ì§?ë¥¼ ëª©ë¡?ì?? ë³´ë?´ê¸°(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contact"
 msgstr "ë©?ì??ì§?ë¥¼ ì?°ë?½ì²?ì?? ë³´ë?´ê¸°(_S)"
 
-#: ../modules/addressbook/eab-composer-util.c:137
+#: ../modules/addressbook/eab-composer-util.c:143
 msgid "Multiple vCards"
 msgstr "ì?¬ë?¬ ê°? vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:145
+#: ../modules/addressbook/eab-composer-util.c:151
 #, c-format
 msgid "vCard for %s"
 msgstr "%sì?? ë??í?? vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
+#: ../modules/addressbook/eab-composer-util.c:163
+#: ../modules/addressbook/eab-composer-util.c:190
 #, c-format
 msgid "Contact information"
 msgstr "ì?°ë?½ì²? ì ?ë³´"
 
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:192
 #, c-format
 msgid "Contact information for %s"
 msgstr "%sì?? ë??í?? ì?°ë?½ì²? ì ?ë³´"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "ì?µëª?ì?¼ë¡?"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "í??ê³?ì¹?ì?? ë??ë?¬í?  ë??ê¹?ì§? ì?´ ì£¼ì??ë¡? ë³´ê¸°(_R)"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "ë¡?ê·¸ì?¸(_G):"
 
 # LDAP ì??ì¹?í?  ë?? ì??ë?? ë?¸ë??ë¥¼ ê²?ì??í? ì§? ì? í??
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "í?? ë?¨ê³?"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "ê²?ì?? í??í?°"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "ê²?ì?? ê¸°ì¤?(_B):"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "ê²?ì?? í??í?°(_F):"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14864,168 +14852,141 @@ msgstr ""
 
 # LDAP ì??ì¹?í?  ë?? ì??ë?? ë?¸ë??ë¥¼ ê²?ì??í? ì§? ì? í??
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "ì??ë?? ë?¨ê³?"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "ì§?ì??í??ë?? ê²?ì?? ê¸°ì¤?"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "ê³ ì?  ì?´ë¦? (DN) ì?¬ì?©"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "ì ?ì??ë©?ì?¼ ì£¼ì?? ì?¬ì?©í?´ì??"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "ë?¤ì?´ë¡?ë?? ì ?í??(_D):"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "ê°?ë?¥í?? ê²?ì?? ê¸°ì¤? ì°¾ê¸°(_F)"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "ë¡?ê·¸ì?¸ ë°©ë²?(_L):"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "í?¬í?¸(_P):"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "ê²?ì?? ë²?ì??(_S):"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "ì ?í??ì??ê°?(_T):"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "ë³´ì?? ì?°ê²° ì?¬ì?©(_U):"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "ì¹´ë??"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "ê°?ì ¸ì?¤ê¸°(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "ë?¬ë ¥ ì? í??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "ì??ì?? ëª©ë¡? ì? í??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "ë?¬ë ¥ì?¼ë¡? ê°?ì ¸ì?¤ê¸°(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
 msgstr "ì??ì??ì?¼ë¡? ê°?ì ¸ì?¤ê¸°(_M)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-cal-shell-backend.c:106
+#: ../modules/calendar/e-cal-shell-migrate.c:181
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "ì?¹"
 
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:108
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "ë? ì?¨"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:193
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "ì??ì?¼ ë°? ê¸°ë??ì?¼"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:406
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ì?½ì??(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "ì?? ì?½ì??ì?? ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:413
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "í??ë£¨ ì¢?ì?¼ ì?½ì??(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:415
 msgid "Create a new all-day appointment"
 msgstr "ì?? í??ë£¨ ì¢?ì?¼ ì?½ì??ì?? ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "M_eeting"
 msgstr "ëª¨ì??(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:422
 msgid "Create a new meeting request"
 msgstr "ì?? ëª¨ì?? ì??ì²ì?? ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ë?¬ë ¥(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "ì?? ë?¬ë ¥ì?? ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:717
+#: ../plugins/itip-formatter/itip-formatter.c:2669
 msgid "Calendar and Tasks"
 msgstr "ë?¬ë ¥ ë°? ì??ì??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "ë?¬ë ¥ ì ?ì?¥"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ì??ë³¼ë£¨ì?? ë?¬ë ¥ í?´ë??ì?? ì??ì¹?ì?? êµ¬ì¡°ê°? ì??ë³¼ë£¨ì?? 1.xì?? ë?¤ë¥´ê²? ë°?ë??ì??ì?µë??ë?¤.\n"
-"\n"
-"í?´ë??ë¥¼ ì?®ê¸°ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "evolution/config.xmldbì?? ê³¼ê±° ì?¤ì ?ì?? ì?®ê²¨ ì?¬ ì?? ì??ì?µë??ë?¤"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "`%s' ë?¬ë ¥ì?? ì?®ê²¨ ì?¬ ì?? ì??ì?µë??ë?¤"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:171
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -15034,37 +14995,21 @@ msgstr ""
 "%sì??ì?? ì?¤ë¥? ë°?ì??:\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:239
 msgid "Loading calendars"
 msgstr "ë?¬ë ¥ ì?½ì?´ë?¤ì?´ë?? ì¤?"
 
+#: ../modules/calendar/e-cal-shell-sidebar.c:674
+msgid "_New Calendar..."
+msgstr "ì?? ë?¬ë ¥(_N)..."
+
 # a11y
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:691
 msgid "Calendar Selector"
 msgstr "ë?¬ë ¥ ì? í??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "ë? ì§? ë³´ê¸° ì??ì ¯"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "ì?´ ì??ì ¯ì?? ì??ì?? ë?¬ë ¥ì?? í??ì??í?©ë??ë?¤"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "ê¸°ë³¸ ë?¬ë ¥ í??ë¡?ê·¸ë?¨"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "ë?¬ë ¥ ë??ì??ì?? ë??í?? ê¸°ë³¸ í??ë¡?ê·¸ë?¨"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "ì?´ ì??ì ¯ì?? ë?¬ë ¥ ëª¨ì??ì?? í??ì??í?©ë??ë?¤"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:1032
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s ì??ì¹?ì??ì?? ë?¬ë ¥ì?? ì?¬ë?? ì¤?"
@@ -15096,308 +15041,308 @@ msgstr "ë?¤ì??ë³´ë?¤ ì?¤ë??ë?? í??ì?¬ ì§?ì?°ê¸°:"
 msgid "Copying Items"
 msgstr "í?ëª©ì?? ë³µì?¬í??ë?? ì¤?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 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:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "í??ì?¬"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "iCalendar í??ì??ì?¼ë¡? ì ?ì?¥"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Copy..."
 msgstr "ë³µì?¬(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "ë?¬ë ¥ ì?ì ?(_E)"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "ì? í??í?? ë?¬ë ¥ì?? ì?ì ?í?©ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "ë?¤ë¡? ì?´ë??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "ì??ì?¼ë¡? ì?´ë??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "ì?¤ë?? ì? í??(_T)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "ì?¤ë?? ì? í??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "ë? ì§? ì? í??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "ì§?ì ?í?? ë? ì§? ì? í??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "ì?? ë?¬ë ¥(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "ì??ì ?í?? ì§?ì?°ê¸°(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "ì§?ë??ê°? ì?½ì??ê³¼ ëª¨ì??ì?? ì??ì ?í?? ì§?ì??ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "ì??ë¡? ê³ ì¹¨(_F)"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "ì? í??í?? ë?¬ë ¥ì?? ì??ë¡? ê³ ì¹©ë??ë?¤"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "ì? í??í?? ë?¬ë ¥ ì?´ë¦?ì?? ë°?ê¿?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "ì?´ ë?¬ë ¥ë§? í??ì??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "ë?¬ë ¥ì?¼ë¡? ë³µì?¬(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "ëª¨ì?? ë??ë¦¬(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "ì?½ì?? ì?ì ?(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "ì? í??í?? ì?½ì??ì?? ì?ì ?í?©ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "ì?´ ê²½ì?° ì?ì ?(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "ì?´ ê²½ì?°ë¥¼ ì?ì ?í?©ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "ëª¨ë?  ê²½ì?° ì?ì ?(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "ëª¨ë?  ê²½ì?°ë¥¼ ì?ì ?í?©ë??ë?¤"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "ì?? í??ë£¨ ì¢?ì?¼ í??ì?¬(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "ì?? í??ë£¨ ì¢?ì?¼ ì?½ì??ì?? ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "iCalendarë¡? ì ?ë?¬(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "ì?? ëª¨ì??(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "ì?? ëª¨ì??ì?? ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "ë?¬ë ¥ì?¼ë¡? ì?´ë??(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "ì?? ì?½ì??(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "ì?´ ê²½ì?° ì?®ê¸¸ ì?? ì??ê²? ë§?ë?¤ê¸°(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "ì?½ì?? ì?´ê¸°(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "í??ì?¬ ì?½ì??ì?? ë´?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "í??ì? (_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
 msgstr "iCalendar í??ì??ì?¼ë¡? ì ?ì?¥..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "ëª¨ì?? ì ?í??ê¸°(_S)..."
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "ì?½ì??ì?? ëª¨ì??ì?¼ë¡? ë³?í??í?©ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "ì?½ì??ì?¼ë¡? ë³?í??(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "ëª¨ì??ì?? ì?½ì??ì?¼ë¡? ë³?í??í?©ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "Quit"
+msgstr "ë??ë?´ê¸°"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "í??ë£¨"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "í??ë£¨ì?© ë´?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "ëª©ë¡?"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "ëª©ë¡?ì?¼ë¡? ë´?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "í?? ë?¬"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "í?? ë?¬ì?© ë´?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "í?? ì£¼ì?©"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "í?? ì£¼ì?© ë´?ë??ë?¤"
 
 # tooltip
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "í?? ì£¼ì?© ê·¼ë¬´ì?¼ ê¸°ì¤?ì?¼ë¡? ë´?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "í??ì?±í??í?? ì?½ì??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "ì??ì?¼ë¡? 7ì?¼ ê°?ì?? ì?½ì??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "ì?¤ëª?ì?? í?¬í?¨"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "ì??ì?½ì?? í?¬í?¨"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "ì?´ ë?¬ë ¥ì?? ì?¸ì??í?©ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "ì?¸ì??í?  ë?¬ë ¥ì?? ë¯¸ë¦¬ ë´?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 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:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
 msgid "memo"
 msgstr "ë©?ëª¨"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "New _Memo"
 msgstr "ì?? ë©?ëª¨(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "ì?? ë©?ëª¨ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "_Open Memo"
 msgstr "ë©?ëª¨ ì?´ê¸°(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
 msgstr "ì? í??í?? ë©?ëª¨ë¥¼ ë´?ë??ë?¤"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "ì?¹ í??ì?´ì§? ì?´ê¸°(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
 msgstr "ì? í??í?? ë©?ëª¨ë¥¼ ì?¸ì??í?©ë??ë?¤"
 
@@ -15406,22 +15351,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:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "ì??ì??"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "ì??ì?? í? ë?¹(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "ì??ì?? ì??ë£? í??ì??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "ì? í??í?? ì??ì??ì?? ë§?ì¹? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
@@ -15430,96 +15375,76 @@ msgid "_Mark as Incomplete"
 msgstr "ì??ì?? ë¯¸ì??ë£? í??ì??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "ì? í??í?? ì??ì??ì?? ë¯¸ì??ë£?ë¡? í??ì??í?©ë??ë?¤"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "ì?? ì??ì??(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "ì?? ì??ì??ì?? ë§?ë?ë??ë?¤"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "ì??ì?? ì?´ê¸°(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "ì? í??í?? ì??ì??ì?? ë´?ë??ë?¤"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "iCalendarë¡? ì ?ì?¥(_S)..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "ì? í??í?? ì??ì??ì?? ì?¸ì??í?©ë??ë?¤"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:279
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ë©?ëª¨(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "ê³µì?  ë©?ëª¨(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:288
 msgid "Create a new shared memo"
 msgstr "ì?? ê³µì?  ë©?ëª¨ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:296
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ë©?ëª¨ ëª©ë¡?(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "ì?? ë©?ëª¨ ëª©ë¡?ì?? ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "ë©?ëª¨ ëª©ë¡? ì ?ì?¥"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "ë©?ëª¨ í??ì?´ë¸? ëª¨ë?¸"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
 msgstr "ë©?ëª¨ë¥¼ ì?½ì?´ë?¤ì?´ë?? ì¤?ì??ë??ë?¤"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:613
 msgid "Memo List Selector"
 msgstr "ë©?ëª¨ ëª©ë¡? ì? í??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "ê¸°ë³¸ ë©?ëª¨ í??ë¡?ê·¸ë?¨"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "ë©?ëª¨ ë??ì??ì?? ë??í?? ê¸°ë³¸ í??ë¡?ê·¸ë?¨"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "ì?´ ì??ì ¯ì?? ë©?ëª¨ ëª©ë¡? ëª¨ì??ì?? í??ì??í?©ë??ë?¤"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:918
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%sì?? ì??ë?? ë©?ëª¨ë¥¼ ì?¬ë?? ì¤?ì??ë??ë?¤"
@@ -15529,64 +15454,64 @@ msgstr "%sì?? ì??ë?? ë©?ëª¨ë¥¼ ì?¬ë?? ì¤?ì??ë??ë?¤"
 msgid "Print Memos"
 msgstr "ë©?ëª¨ ì?¸ì??"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_Delete Memo"
 msgstr "ë©?ëª¨ ì?ì ?(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Find in Memo..."
 msgstr "ë©?ëª¨ì??ì?? ì°¾ê¸°(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
 msgstr "í??ì??í?? ë©?ëª¨ì??ì?? í??ì?¤í?¸ë¥¼ ì°¾ì?µë??ë?¤"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
 msgstr "ë©?ëª¨ ëª©ë¡? ì?ì ?(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
 msgstr "ì? í??í?? ë©?ëª¨ ëª©ë¡?ì?? ì?ì ?í?©ë??ë?¤"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
 msgstr "ì?? ë©?ëª¨ ëª©ë¡?(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
 msgstr "ì? í??í?? ë©?ëª¨ ëª©ë¡?ì?? ì??ë¡? ê³ ì¹©ë??ë?¤"
 
 # tooltip
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
 msgstr "ì? í??í?? ë©?ëª¨ ëª©ë¡?ì?? ì?´ë¦?ì?? ë°?ê¿?ë??ë?¤"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
 msgstr "ì?´ ë©?ëª¨ ëª©ë¡?ë§? í??ì??(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
 msgid "Memo _Preview"
 msgstr "ë©?ëª¨ ë¯¸ë¦¬ ë³´ê¸°(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
 msgstr "ë©?ëª¨ ë¯¸ë¦¬ ë³´ê¸° ì°½ ë³´ê¸°"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
 msgstr "ë©?ëª¨ ëª©ë¡? ì??ë??ì?? ë©?ëª¨ ë¯¸ë¦¬ ë³´ê¸°ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
 msgstr "ë©?ëª¨ ëª©ë¡?ê³¼ ë??ë??í?? ë©?ëª¨ ë¯¸ë¦¬ ë³´ê¸°ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
 msgstr "ë©?ëª¨ ëª©ë¡? ì?¸ì??"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
 msgstr "ì?¸ì??í?  ë©?ëª¨ ëª©ë¡?ì?? ë¯¸ë¦¬ ë´?ë??ë?¤"
 
@@ -15610,77 +15535,40 @@ msgstr "ë©?ëª¨ ì?ì ?"
 msgid "Delete Memo"
 msgstr "ë©?ëª¨ ì?ì ?"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:278
 msgctxt "New"
 msgid "_Task"
 msgstr "ì??ì??(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:285
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "í? ë?¹í?? ì??ì??(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgid "Create a new assigned task"
 msgstr "ì??ë¡? í? ë?¹í?? ì??ì??ì?? ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:295
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "ì??ì?? ëª©ë¡?(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "ì?? ì??ì?? ëª©ë¡?ì?? ë§?ë?ë??ë?¤"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "ì??ì?? ëª©ë¡? ì ?ì?¥"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "ì??ì?? í??ì?´ë¸? ëª¨ë?¸"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"ì??ë³¼ë£¨ì?? ì??ì?? í?´ë??ì?? ì??ì¹?ì?? êµ¬ì¡°ê°? ì??ë³¼ë£¨ì?? 1.xì?? ë?¤ë¥´ê²? ë°?ë??ì??ì?µë??ë?¤.\n"
-"\n"
-"í?´ë??ë¥¼ ì?®ê¸°ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "`%s' ì??ì??ì?? ì?®ê²¨ ì?¬ ì?? ì??ì?µë??ë?¤"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:233
 msgid "Loading tasks"
 msgstr "ì??ì??ì?? ì?½ì?´ë?¤ì?´ë?? ì¤?ì??ë??ë?¤"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:613
 msgid "Task List Selector"
 msgstr "ì??ì?? ëª©ë¡? ì? í??"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "ê¸°ë³¸ ì??ì?? í??ë¡?ê·¸ë?¨"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "ì??ì?? ë??ì??ì?? ë??í?? ê¸°ë³¸ í??ë¡?ê·¸ë?¨"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "ì?´ ì??ì ¯ì?? ì??ì?? ëª©ë¡? ëª¨ì??ì?? í??ì??í?©ë??ë?¤"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:918
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%sì?? ì??ë?? ì??ì??ì?? ì?¬ë?? ì¤?ì??ë??ë?¤"
@@ -15690,7 +15578,7 @@ msgstr "%sì?? ì??ë?? ì??ì??ì?? ì?¬ë?? ì¤?ì??ë??ë?¤"
 msgid "Print Tasks"
 msgstr "ì??ì?? ì?¸ì??"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15702,97 +15590,97 @@ msgstr ""
 "\n"
 "ì ?ë§?ë¡? ì?´ ì??ì??ë?¤ì?? ì§?ì?°ì??ê² ì?µë??ê¹??"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "ì??ì?? ì?ì ?(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "ì??ì??ì??ì?? ì°¾ê¸°(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "í??ì??í?? ì??ì??ì??ì?? í??ì?¤í?¸ë¥¼ ì°¾ì?µë??ë?¤"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "ë³µì?¬..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "ì??ì?? ëª©ë¡? ì?ì ?(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "ì? í??í?? ì??ì?? ëª©ë¡?ì?? ì?ì ?í?©ë??ë?¤"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "ì?? ì??ì?? ëª©ë¡?(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "ì? í??í?? ì??ì?? ëª©ë¡?ì?? ì??ë¡? ê³ ì¹©ë??ë?¤"
 
 # tooltip
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "ì? í??í?? ì??ì?? ëª©ë¡? ì?´ë¦?ì?? ë°?ê¿?ë??ë?¤"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "ì?´ ì??ì?? ëª©ë¡?ë§? í??ì??(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "ì??ì?? ë¯¸ì??ë£? í??ì??(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "ë??ë§?ì¹? ì??ì??ì?? ì?ì ?í?©ë??ë?¤"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "ì??ì?? ë¯¸ë¦¬ ë³´ê¸°(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "ì??ì?? ë¯¸ë¦¬ ë³´ê¸° ì°½ ë³´ê¸°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "ì??ì?? ëª©ë¡? ì??ë??ì?? ì??ì?? ë¯¸ë¦¬ ë³´ê¸°ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "ì??ì?? ëª©ë¡?ê³¼ ë??ë??í?? ì??ì?? ë¯¸ë¦¬ ë³´ê¸°ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "í??ì?±í??í?? ì??ì??"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "ì??ë£?í?? ì??ì??"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "ì??ì?¼ë¡? 7ì?¼ ê°?ì?? ì??ì??"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "ë§?ê°?ì?´ ì§?ë?? ì??ì??"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "ì²¨ë¶?ê°? ì??ë?? ì??ì??"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "ì??ì?? ëª©ë¡? ì?¸ì??"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "ì?¸ì??í?  ì??ì?? ëª©ë¡?ì?? ë¯¸ë¦¬ ë´?ë??ë?¤"
 
@@ -15815,485 +15703,473 @@ msgid "Delete Task"
 msgstr "ì??ì?? ì?ì ?"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:345
 #, c-format
 msgid "%d attached messages"
 msgstr "ì²¨ë¶?í?? ë©?ì??ì§? %dê°?"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ë©?ì?¼ ë©?ì??ì§?(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:173
 msgid "Compose a new mail message"
 msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ì??ë¡? ì??ì?±í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ë©?ì?¼ í?´ë??(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgid "Create a new mail folder"
 msgstr "ì?? ë©?ì?¼ í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:481
 msgid "Mail Accounts"
 msgstr "ë©?ì?¼ ê³?ì ?"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Preferences"
 msgstr "ë©?ì?¼ ê¸°ë³¸ ì?¤ì ?"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Composer Preferences"
 msgstr "ë©?ì?¼ ì??ì?± ê¸°ë³¸ ì?¤ì ?"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Network Preferences"
 msgstr "ë?¤í?¸ì??í?¬ ê¸°ë³¸ ì?¤ì ?"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "ê¸?í??ë??ë¡? ë¬¶ì??"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "ë©?ì??ì§?ë¥¼ ê¸?í??ë?? ë?¨ì??ë¡? ë¬¶ì??ì§? ì?¬ë¶?"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view.c:883
 msgid "_Disable Account"
 msgstr "ê³?ì ? ì?¬ì?© ì??ê¸°(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:882
 msgid "Disable this account"
 msgstr "ì?´ ê³?ì ?ì?? ì?¬ì?©í??ì§? ì??ì?µë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:889
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "ëª¨ë?  í?´ë??ì?? ì?ì ?í?? ë©?ì??ì§?ë¥¼ ì??ì ?í?? ì ?ê±°í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "C_reate Search Folder From Search..."
 msgstr "ê²?ì??í?? ê²°ê³¼ë¡? ê²?ì?? í?´ë?? ë§?ë?¤ê¸°(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 msgid "_Download Messages for Offline Usage"
 msgstr "ì?°ê²° ì¤?ì§? ì??í?? ì?©ë??ë¡? ë©?ì??ì§? ë?¤ì?´ë¡?ë??(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:903
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ì?°ê²° ì¤?ì§? ì??í?? ì?¬ì?©ì?¼ë¡? í??ì??í?? ê³?ì ? ë°? í?´ë??ì?? ë©?ì??ì§?ë¥¼ ë?¤ì?´ë¡?ë??í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:908
 msgid "Fl_ush Outbox"
 msgstr "ë³´ë?¼ í?¸ì§?í?¨ ë¹?ì?°ê¸°(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "_Copy Folder To..."
 msgstr "í?´ë?? ë³µì?¬(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:917
 msgid "Copy the selected folder into another folder"
 msgstr "ì? í??í?? í?´ë??ë¥¼ ë?¤ë¥¸ í?´ë??ë¡? ë³µì?¬í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:924
 msgid "Permanently remove this folder"
 msgstr "ì?´ í?´ë??ë¥¼ ì??ì ?í?? ì ?ê±°í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "E_xpunge"
 msgstr "ì??ì ?í?? ì?ì ?(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:931
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ì?´ í?´ë??ì?? ì?ì ?í?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ì??ì ?í?? ì ?ê±°í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "Mar_k All Messages as Read"
 msgstr "ëª¨ë?  ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:938
 msgid "Mark all messages in the folder as read"
 msgstr "í?´ë??ì?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:943
 msgid "_Move Folder To..."
 msgstr "í?´ë?? ì?®ê¸°ê¸°(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:945
 msgid "Move the selected folder into another folder"
 msgstr "ì? í??í?? í?´ë??ë¥¼ ë?¤ë¥¸ í?´ë??ë¡? ì?®ê¹?ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "_New..."
 msgstr "ì??ë¡? ë§?ë?¤ê¸°(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:952
 msgid "Create a new folder for storing mail"
 msgstr "ë©?ì?¼ì?? ì ?ì?¥í??ë?? ì?? í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:959
 msgid "Change the properties of this folder"
 msgstr "ì?´ í?´ë??ì?? ì??ì?±ì?? ë°?ê¿?ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 msgid "Refresh the folder"
 msgstr "í?´ë??ë¥¼ ì??ë¡? ê³ ì¹¨"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 msgid "Change the name of this folder"
 msgstr "ì?´ í?´ë??ì?? ì?´ë¦?ì?? ë°?ê¿?ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Select Message _Thread"
 msgstr "ë©?ì??ì§? ê¸?í??ë?? ì? í??(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:980
 msgid "Select all messages in the same thread as the selected message"
 msgstr "ì? í??í?? ë©?ì??ì§?ì?? ê°?ì?? ê¸?í??ë??ì?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ì? í??í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Select Message S_ubthread"
 msgstr "ë©?ì??ì§? ì??ë?? ê¸?í??ë?? ì? í??(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:987
 msgid "Select all replies to the currently selected message"
-msgstr "í??ì?¬ ì? í??í?? ë©?ì??ì§?ì?? ë?µì?¥ì?? ëª¨ë?? ì? í??í?©ë??ë?¤"
+msgstr "í??ì?¬ ì? í??í?? ë©?ì??ì§?ì?? í??ì? ì?? ëª¨ë?? ì? í??í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "_Unsubscribe"
 msgstr "êµ¬ë?? ì¤?ì§?(_U)"
 
 # tooltip
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "Unsubscribe from the selected folder"
 msgstr "ì? í??í?? í?´ë??ì??ì?? êµ¬ë??ì?? ì¤?ì§?í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Empty _Trash"
 msgstr "í?´ì§?í?µ ë¹?ì?°ê¸°(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ëª¨ë?  í?´ë??ì?? ì?ì ?í?? ë©?ì??ì§?ë¥¼ ì??ì ?í?? ì ?ê±°í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "_New Label"
 msgstr "ì?? ë ?ì?´ë¸?(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
 msgid "N_one"
 msgstr "ì??ì??(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "ì?½ì?? ë©?ì??ì§? ì?¨ê¸°ê¸°(_R)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "ì?´ë¯¸ ì?½ì?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ì??ì??ë¡? ì?¨ê¹?ë??ë?¤"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "ì? í??í?? ë©?ì??ì§? ì?¨ê¸°ê¸°(_E)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "ì? í??í?? ë©?ì??ì§?ë¥¼ ì??ì??ë¡? ì?¨ê¹?ë??ë?¤"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "ì?¨ê¸´ ë©?ì??ì§? ë³´ê¸°(_N)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "ì??ì??ë¡? ì?¨ê¸´ ë©?ì??ì§?ë¥¼ ë³´ì?´ê²? í?©ë??ë?¤"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
 msgid "Cancel the current mail operation"
 msgstr "í??ì?¬ ë©?ì?¼ ë??ì??ì?? ì·¨ì??í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
 msgid "Collapse All _Threads"
 msgstr "ëª¨ë?  ê¸?í??ë?? ì ?ê¸°(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
 msgid "Collapse all message threads"
 msgstr "ëª¨ë?  ë©?ì??ì§? ê¸?í??ë??ë¥¼ ì ?ì?µë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:1050
 msgid "E_xpand All Threads"
 msgstr "ëª¨ë?  ê¸?í??ë?? í?¼ì¹?ê¸°(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
 msgid "Expand all message threads"
 msgstr "ëª¨ë?  ë©?ì??ì§? ê¸?í??ë??ì?? ì§?ì?´ ë©?ì??ì§?ë¥¼ ë¹?ì??ë??ë?¤."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
 msgid "_Message Filters"
 msgstr "ë©?ì??ì§? í??í?°(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:1059
 msgid "Create or edit rules for filtering new mail"
 msgstr "ì?? ë©?ì?¼ í??í?° ê·?ì¹?ì?? ë§?ë?¤ê±°ë?? í?¸ì§?í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Search F_olders"
 msgstr "ê²?ì?? í?´ë??(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 msgid "Create or edit search folder definitions"
 msgstr "ê²?ì?? í?´ë?? ì ?ì??ë¥¼ ë§?ë?¤ê±°ë?? í?¸ì§?í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "_Subscriptions..."
 msgstr "êµ¬ë??(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ì??ê²© ì??ë²?ì?? í?´ë??ë¥¼ êµ¬ë??/êµ¬ë??í?´ì§? í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
 msgid "F_older"
 msgstr "í?´ë??(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "_Label"
 msgstr "ë ?ì?´ë¸?(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_New Folder..."
 msgstr "ì?? í?´ë??(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "ì§?ì?´ ë©?ì??ì§? ì?¨ê¸°ê¸°(_D)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "ì§?ì?´ ë©?ì??ì§?ë¥¼ ì·¨ì??ì? ì?? ê¸?ë?? ë??ì?  ì?¨ê¹?ë??ë?¤"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
 msgid "Show Message _Preview"
-msgstr "ë©?ì??ì§? ë¯¸ë¦¬ë³´ê¸° ë³´ê¸°(_P)"
+msgstr "ë©?ì??ì§? ë¯¸ë¦¬ë³´ê¸° ë³´ì?´ê¸°(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Show message preview pane"
 msgstr "ë©?ì??ì§? ë³´ê¸° ì°½ì?? í??ì??í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "Show _Deleted Messages"
+msgstr "ì?ì ?í?? ë©?ì??ì§? ë³´ì?´ê¸°(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
+msgid "Show deleted messages with a line through them"
+msgstr "ì?ì ?í?? ë©?ì??ì§?ë¥¼ ì? ì?? ê·¸ì?´ í??ì??í?©ë??ë?¤"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "_Group By Threads"
 msgstr "ê¸?í??ë??ë¡? ë¬¶ì??(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Threaded message list"
 msgstr "ì?°ê´?ë?? ë©?ì??ì§? ëª©ë¡?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 msgid "Show message preview below the message list"
 msgstr "ë©?ì??ì§? ëª©ë¡? ì??ë??ì?? ë©?ì??ì§? ë¯¸ë¦¬ ë³´ê¸°ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
 msgid "Show message preview alongside the message list"
 msgstr "ë©?ì??ì§? ëª©ë¡?ê³¼ ë??ë??í?? ë©?ì??ì§? ë¯¸ë¦¬ ë³´ê¸°ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "All Messages"
 msgstr "ëª¨ë?  ë©?ì??ì§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Important Messages"
 msgstr "ì¤?ì??í?? ë©?ì??ì§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Last 5 Days' Messages"
 msgstr "ìµ?ê·¼ 5ì?¼ê°? ë©?ì??ì§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Messages Not Junk"
 msgstr "ì ?í?¬ë©?ì?¼ ì??ë?? ë©?ì??ì§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Messages with Attachments"
 msgstr "ì²¨ë¶?ê°? ì??ë?? ë©?ì??ì§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "No Label"
 msgstr "ë ?ì?´ë¸? ì??ì??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Read Messages"
 msgstr "ì?½ì?? ë©?ì??ì§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Recent Messages"
 msgstr "ìµ?ê·¼ ë©?ì??ì§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Unread Messages"
 msgstr "ì?½ì§? ì??ì?? ë©?ì??ì§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Subject or Addresses contain"
 msgstr "ì ?ëª©ì?´ë?? ì£¼ì??ì?? í?¬í?¨"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "All Accounts"
 msgstr "ëª¨ë?  ê³?ì ?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Current Account"
 msgstr "í??ì?¬ ê³?ì ?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Current Folder"
 msgstr "í??ì?¬ í?´ë??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%dê°? ì? í??, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%dê°? ì?ì ?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%dê°? ì ?í?¬"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%dê°? ì??ì??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%dê°? ì?? ë³´ë??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%dê°? ë³´ë??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%dê°? ì?? ì?½ì??, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "ì ?ì²´ %dê°?"
 
-#: ../modules/mail/e-mail-shell-view.c:548
+#: ../modules/mail/e-mail-shell-view.c:559
 msgid "All Account Search"
 msgstr "ëª¨ë?  ê³?ì ? ê²?ì??"
 
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:686
 msgid "Account Search"
 msgstr "ê³?ì ? ê²?ì??"
 
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:881
 msgid "Proxy _Logout"
 msgstr "í??ë¡?ì?? ë¡?ê·¸ì??ì??(_L)"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-account-prefs.c:133
+msgid "Evolution Account Assistant"
+msgstr "ì??ë³¼ë£¨ì?? ê³?ì ? ë??ì?°ë¯¸"
+
+#: ../modules/mail/em-account-prefs.c:182
+msgid "Account Editor"
+msgstr "ê³?ì ? í?¸ì§?ê¸°"
+
+#: ../modules/mail/em-composer-prefs.c:505
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:211
+msgid "Enabled"
+msgstr "ì?¬ì?©"
+
+#: ../modules/mail/em-composer-prefs.c:509
 msgid "Language(s)"
 msgstr "ì?¸ì?´"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "í?ì??"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "ë§¤ì?¼"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "ë§¤ì£¼"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "ë§¤ë?¬"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:201
 msgid "Add Custom Junk Header"
 msgstr "ì?¬ì?©ì?? ì ?ì?? ì ?í?¬ ë©?ì?¼ í?¤ë?? ì¶?ê°?"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:209
 msgid "Header Name:"
 msgstr "í?¤ë?? ì?´ë¦?:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:210
 msgid "Header Value Contains:"
 msgstr "í?¤ë?? ê°?ì?? í?¬í?¨:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:310
 msgid "Header"
 msgstr "í?¤ë??"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:314
 msgid "Contains Value"
 msgstr "ê°? í?¬í?¨"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
 #, 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:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:715 ../modules/mail/em-mailer-prefs.c:787
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤. í?¨í?¤ì§?ë¥¼ ì?¤ì¹?í??ë??ì§? í??ì?¸í??ì?ì??ì?¤."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:751
 msgid "No junk plugin available"
 msgstr "ì ?í?¬ ë©?ì?¼ í??ë?¬ê·¸ì?¸ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "í??ì?´ë¸? ì?´(_T):"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Date header:"
 msgstr "ë? ì§? í?¤ë??(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Show _original header value"
 msgstr "ì??ë³¸ í?¤ë?? ê°? í??ì??(_O)"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "ì??ë³¼ë£¨ì??ì?´ ê¸°ë³¸ ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?¸ì§? ê²?ì?¬"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "ì??ë³¼ë£¨ì??ì?´ ì??ì??í?  ë??ë§?ë?¤, ê¸°ë³¸ ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?¸ì§? ì?¬ë¶?ë¥¼ ê²?ì?¬í?©ë??ë?¤."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
+msgid "Do you want to make Evolution your default email client?"
+msgstr "ì??ë³¼ë£¨ì??ì?? ê¸°ë³¸ ì ?ì??ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?¼ë¡? í??ì??ê² ì?µë??ê¹??"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "í?¬ë¡? í??ì?´ì?¬"
@@ -16310,6 +16186,52 @@ msgstr "í??ì?´ì?¬ í??ì?¤í?¸ í??ë?¬ê·¸ì?¸"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "í??ì?´ì?¬ EPlugin ë¡?ë?? í??ì?¤í?¸ í??ë?¬ê·¸ì?¸."
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:275
+#: ../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:307
+#: ../widgets/misc/e-import-assistant.c:552
+#, c-format
+msgid "From %s:"
+msgstr "%sì??ì??:"
+
+# ì?¤ì ? tab, ì??í?? í??ì??ê°? ì??ë??
+#: ../modules/startup-wizard/evolution-startup-wizard.c:318
+#: ../modules/startup-wizard/evolution-startup-wizard.c:415
+msgid "Importing Files"
+msgstr "í??ì?¼ ê°?ì ¸ì?¤ê¸°"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:393
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "ê°?ì ¸ì?¤ê¸°ë¥¼ ì·¨ì??í??ì?µë??ë?¤. ê³?ì?? í??ì??ë ¤ë©´ \"ë?¤ì??\"ì?? ë??ë¥´ì?ì??ì?¤."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:411
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "ê°?ì ¸ì?¤ê¸°ë¥¼ ë§?ì³¤ì?µë??ë?¤. ê³?ì?? í??ì??ë ¤ë©´ \"ë?¤ì??\"ì?? ë??ë¥´ì?ì??ì?¤."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:471
+msgid "Evolution Setup Assistant"
+msgstr "ì??ë³¼ë£¨ì?? ì?¤ì ? ë??ì?°ë¯¸"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+msgid "Welcome"
+msgstr "í??ì??í?©ë??ë?¤"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+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"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"ì??ë³¼ë£¨ì??ì?? ì?¬ì?©í??ê²? ë??ì?  ê²?ì?? í??ì??í?©ë??ë?¤. ë?¤ì??ì?? ì?¬ ëª? ê°?ì?? í??ë©´ì??ì?? ì??ë³¼ë£¨ì??"
+"ì?¼ë¡? ì ?ì??ë©?ì?¼ ê³?ì ?ì?? ì?°ê²°í??ë??ë¡? ì?¤ì ?í??ê³ , ë?¤ë¥¸ í??ë¡?ê·¸ë?¨ì??ì?? ì?°ë?? í??ì?¼ë?¤ì?? ê°?"
+"ì ¸ì?¤ê²? ë?©ë??ë?¤.\n"
+"\n"
+"ê³?ì??í??ì??ë ¤ë©´ \"ì??ì?¼ë¡?\" ë?¨ì¶?ë¥¼ ë??ë¥´ì?ì??ì?¤. "
+
 # command line help
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
@@ -16325,14 +16247,8 @@ msgid ""
 "body"
 msgstr "ì²¨ë¶? ì??ë¦¼ í??ë?¬ê·¸ì?¸ì?´ ë©?ì??ì§? ë³¸ë¬¸ì??ì?? ì°¾ì??ë³¼ ê·¼ê±° ëª©ë¡?"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "ì²¨ë¶? ì??ë¦¼ í??ë?¬ê·¸ì?¸ì?´ ë©?ì??ì§? ë³¸ë¬¸ì??ì?? ì°¾ì??ë³¼ ê·¼ê±° ëª©ë¡?."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:410
 msgid "Keywords"
 msgstr "í?¤ì??ë??"
 
@@ -16372,23 +16288,23 @@ msgstr "ë?´ì?¥ ì?¤ë??ì?¤"
 msgid "Play audio attachments directly in mail messages."
 msgstr "ì?¤ë??ì?¤ ì²¨ë¶?ë¥¼ ë©?ì?¼ ë©?ì??ì§?ì??ì?? ì§?ì ? ì?¬ì??í?©ë??ë?¤."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "ì??ë³¼ë£¨ì?? ë°±ì?? í??ì?¼ ì?´ë¦? ì? í??"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "ë°±ì??í?? ë?¤ì??ì?? ì??ë³¼ë£¨ì?? ë?¤ì?? ì??ì??(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "ë³µêµ¬í?  ì??ë³¼ë£¨ì?? ë°±ì?? í??ì?¼ ì?´ë¦? ì? í??"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "ë³µêµ¬í?? ë?¤ì??ì?? ì??ë³¼ë£¨ì?? ë?¤ì?? ì??ì??(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16397,35 +16313,35 @@ msgstr ""
 "ë°±ì??ì??ì?? ì??ë³¼ë£¨ì??ì?? ë³µêµ¬í?  ì?? ì??ì?µë??ë?¤. ë©?ì?¼, ë?¬ë ¥, ì??ì??, ë©?ëª¨, ì?°ë?½ì²? ëª¨ë??"
 "ë¥¼ ë³µêµ¬í?  ì?? ì??ì?µë??ë?¤. ëª¨ë?  ê°?ì?¸ ì?¤ì ?, ë©?ì?¼ í??í?° ê¸°ë?¥ ë?±ë?? ë³µêµ¬í?©ë??ë?¤."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "ë°±ì?? ë°±ì?? í??ì?¼ì??ì?? ì??ë³¼ë£¨ì?? ë³µêµ¬(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "ë³µêµ¬í?  ì??ë³¼ë£¨ì?? ì??ì¹´ì?´ë¸?ë¥¼ ì? í??í?´ ì£¼ì?ì??ì?¤:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "ë³µêµ¬í?  í??ì?¼ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "ë°±ì??ì??ì?? ë³µêµ¬"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "ì?¤ì ? ë°±ì??(_B)..."
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "ì?¡ë¡?ë£¨ì?? ì?¤ì ? ë°±ì??(_B)..."
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?° ë°? ì?¤ì ?ì?? ì??ì¶? í??ì?¼ì?? ë°±ì??í?©ë??ë?¤"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "ì?¤ì ? ë³µêµ¬(_E)..."
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "ì??ë³¼ë£¨ì?? ì?¤ì ? ë³µêµ¬(_E)..."
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?° ë°? ì?¤ì ?ì?? ì??ì¶? í??ì?¼ì??ì?? ë³µêµ¬í?©ë??ë?¤"
 
@@ -16473,7 +16389,7 @@ msgid "Restarting Evolution"
 msgstr "ì??ë³¼ë£¨ì?? ë?¤ì?? ì??ì??í??ë?? ì¤?"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "í??ì?¬ ì??ë³¼ë£¨ì?? ë?°ì?´í?°ë¥¼ ë°±ì??"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -16503,31 +16419,31 @@ msgid "Restoring from the folder %s"
 msgstr "%s í?´ë??ì??ì?? ë³µêµ¬í??ë?? ì¤?"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "ì??ë³¼ë£¨ì?? ë°±ì??"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "ì??ë³¼ë£¨ì?? ë³µêµ¬"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:496
 msgid "Backing up Evolution Data"
 msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?°ë¥¼ ë°±ì??í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:497
 msgid "Please wait while Evolution is backing up your data."
 msgstr "ì??ë³¼ë£¨ì??ì??ì?? ë?°ì?´í?°ë¥¼ ë°±ì??í??ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:499
 msgid "Restoring Evolution Data"
 msgstr "ì??ë³¼ë£¨ì?? ë?°ì?´í?°ë¥¼ ë³µêµ¬í??ë?? ì¤?ì??ë??ë?¤"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:500
 msgid "Please wait while Evolution is restoring your data."
 msgstr "ì??ë³¼ë£¨ì??ì??ì?? ë?°ì?´í?°ë¥¼ ë³µêµ¬í??ë?? ë??ì?? ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:518
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "ì?´ ì??ì??ì?? ê³?ì ?ì?? ë?°ì?´í?° í?¬ê¸°ì?? ë?°ë?¼ ì??ê°?ì?´ ê±¸ë¦´ ì??ë?? ì??ì?µë??ë?¤."
 
@@ -16550,74 +16466,77 @@ msgid ""
 msgstr "ì? í??í?? ë°±ì?? í??ì?¼ì??ì?? ì ?ë§?ë¡? ì??ë³¼ë£¨ì??ì?? ë³µêµ¬í??ì??ê² ì?µë??ê¹??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"ì??ë³¼ë£¨ì??ì?? ì?¤í??í??ì§? ì??ì?? ë??ë§? ë°±ì??ì?? ì??ì??í?  ì?? ì??ì?µë??ë?¤. ë°±ì??ì?? ì??ì??í??ê¸° ì ?"
-"ì?? ëª¨ë?  í??ì?¼ì?? ì ?ì?¥ í?? ì¢?ë£?í??ì??ë?? ì§?ë¥¼ í??ì?¸í?©ë??ë?¤. ë°±ì?? í?? ì??ë³¼ë£¨ì??ì?? ì??ë??ì?¼"
-"ë¡? ì?¤í??í??ì??ê³ ì?? í?  ê²½ì?° í? ê¸? ë?¨ì¶?ë¥¼ í??ì?±í??í?©ë??ë?¤."
+msgid "Close and Backup Evolution"
+msgstr "ì??ë³¼ë£¨ì??ì?? ë?«ê³  ë°±ì??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Close and Restore Evolution"
+msgstr "ì??ë³¼ë£¨ì??ì?? ë?«ê³  ë³µêµ¬"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Insufficient Permissions"
 msgstr "ê¶?í??ì?´ ì??ì?µë??ë?¤"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "ì??ë³¼ë£¨ì?? ë°±ì?? í??ì?¼ì?´ ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
 msgstr "ë³µêµ¬í?  ì?¬ë°?ë¥¸ ë°±ì?? í??ì?¼ì?? ì? í??í??ì?ì??ì?¤."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
 msgstr "ì? í??í?? í?´ë??ë?? ì?½ê¸° ì ?ì?©ì??ë??ë?¤."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To backup your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"ë?°ì?´í?°ì?? ì?¤ì ?ì?? ë°±ì??í??ë ¤ë©´, ë¨¼ì ? ì??ë³¼ë£¨ì??ì?? ë?«ì?¼ì?ì??ì?¤. ì ?ì?¥í??ì§? ì??ì?? ë?°ì?´í?°"
+"ê°? ì??ì?¼ë©´ ê³?ì?? í??ì??ê¸° ì ?ì?? ë¯¸ë¦¬ ì ?ì?¥í??ì?ì??ì?¤."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
 msgstr ""
-"í??ì?¬ ì??ë³¼ë£¨ì??ì?? ì??ë?? ëª¨ë?  ë?°ì?´í?° ë°? ì?¤ì ?ì?? ì?ì ?í??ê³  ì?´ë¥¼ ë°±ì?? í??ì?¼ì??ì?? ë³µêµ¬í?©"
-"ë??ë?¤. ì??ë³¼ë£¨ì??ì?´ ì?¤í??ë??ì§? ì??ì?? ê²½ì?°ì??ë§? ì?´ë¥¼ ë³µêµ¬í?  ì?? ì??ì?µë??ë?¤. ë°±ì??ì?? ì??ì??"
-"í??ê¸° ì ?ì?? ëª¨ë?  í??ì?¼ì?? ì ?ì?¥ í?? ì¢?ë£?í??ì??ë?? ì§?ë¥¼ í??ì?¸í?©ë??ë?¤. ë°±ì?? í?? ì??ë³¼ë£¨ì??ì?? "
-"ì??ë??ì?¼ë¡? ì?¤í??í??ì??ê³ ì?? í?  ê²½ì?° í? ê¸? ë?¨ì¶?ë¥¼ í??ì?±í??í?©ë??ë?¤."
+"ë?°ì?´í?°ì?? ì?¤ì ?ì?? ë³µêµ¬í??ë ¤ë©´, ë¨¼ì ? ì??ë³¼ë£¨ì??ì?? ë?«ì?¼ì?ì??ì?¤. ì ?ì?¥í??ì§? ì??ì?? ë?°ì?´í?°"
+"ê°? ì??ì?¼ë©´ ê³?ì?? í??ì??ê¸° ì ?ì?? ë¯¸ë¦¬ ì ?ì?¥í??ì?ì??ì?¤. ê³?ì?? í??ì??ë©´ í??ì?¬ ì??ë³¼ë£¨ì?? ë?°ì?´"
+"í?°ì?? ì?¤ì ?ì?? ì?ì ?í??ê³  ë°±ì??ì??ì?? ë³µêµ¬í?©ë??ë?¤."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "ì??ë?? ì?°ë?½ì²?"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "ë©?ì?¼ì?? ë³´ë?¼ ë?? ì£¼ì??ë¡?ì?? í?ëª© ë§?ë?¤ê¸°(_A)"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "ì??ë?? ì?°ë?½ì²?ë¥¼ ì?¬ì?©í?  ì£¼ì??ë¡?ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "ì?¸ì?¤í?´ì?¤ ë©?ì??ì§? ì?°ë?½ì²?"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "í?¼ì§? ì¹?êµ¬ ëª©ë¡?ì?? ì ?ë³´ ë°? ê·¸ë¦¼ì?? ë??ê¸°í??"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "í?¼ì§? ì¹?êµ¬ ëª©ë¡?ì?? ì?°ë?½ì²? ì ?ë³´ ë°? ê·¸ë¦¼ì?? ë??ê¸°í??(_S)"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "í?¼ì§? ì¹?êµ¬ ëª©ë¡?ì?? ì?¬ì?©í?  ì£¼ì??ë¡?ì?? ì? í??í??ì?ì??ì?¤"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "ì§?ê¸? ì¹?êµ¬ ëª©ë¡?ê³¼ ë??ê¸°í??(_B)"
 
@@ -16635,31 +16554,31 @@ msgid ""
 msgstr ""
 "ì£¼ì??ë¡? ê´?ë¦¬ ë?¨ì?? ì??ì??ì?? ì??í??í?©ë??ë?¤.\n"
 "\n"
-"ë©?ì??ì§?ì?? ë?µì?¥í?  ë??ë§?ë?¤ ì??ë??ì?¼ë¡? ì?´ë¦?ê³¼ ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ ì£¼ì??ë¡?ì?? ë?£ì?µë??ë?¤. ë?? "
+"ë©?ì??ì§?ì?? í??ì? í?  ë??ë§?ë?¤ ì??ë??ì?¼ë¡? ì?´ë¦?ê³¼ ì ?ì??ë©?ì?¼ ì£¼ì??ë¥¼ ì£¼ì??ë¡?ì?? ë?£ì?µë??ë?¤. ë?? "
 "ì¹?êµ¬ ëª©ë¡?ì??ì?? ì?¸ì?¤í?´ì?¤ ë©?ì??ì§? ì?°ë?½ì²? ì ?ë³´ë¥¼ ì±?ì?? ë?£ì?µë??ë?¤."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "ë³´ê³ í??í?°ê°? ì??ì?µë??ë?¤. ë³´ê³ í??í?°ë¥¼ ë¨¼ì ? ì?¤ì¹?í??ì?ì??ì?¤."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "%s ì?¤í?? ì¤?ì?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "ë³´ê³ í??í?° í??ì?? í??ë¡?ì?¸ì?¤ê°? ì??ë?µí??ì§? ì??ì?µë??ë?¤. ê°?ì ?ë¡? ë??ë??ë??ë?¤..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ë³´ê³ í??í?° í??ì?? í??ë¡?ì?¸ì?¤ ë??ê¸°ê°? ì¤?ì§?ë??ì??ì?µë??ë?¤. ê°?ì ?ë¡? ë??ë??ë??ë?¤..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "ë³´ê³ í??í?°ì?? ë??í?? í??ì?´í??ê°? ì?¤í?¨í??ì?µë??ë?¤. ì?¤ë¥? ì½?ë??: %d."
@@ -16692,15 +16611,15 @@ msgstr "ë³´ê³ í??í?° ì?µì??"
 msgid "Filter junk messages using Bogofilter."
 msgstr "ë³´ê³ í??í?°ë¥¼ ì?¬ì?©í?´ ì ?í?¬ ë©?ì??ì§?ë¥¼ í??í?°ë§?í?©ë??ë?¤."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "ì?¸ì¦? ì?¤í?¨. ì?´ ì??ë²?ë?? ë¡?ê·¸ì?¸ì?? í?´ì?¼ í?©ë??ë?¤."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "í?´ë?¹ URLì?? ì°¾ì?? ì?? ì??ì?µë??ë?¤."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16709,36 +16628,31 @@ msgstr ""
 "ì??ë²?ì??ì?? ì??ì??ì¹? ëª»í?? ë?°ì?´í?°ë¥¼ ë°?í??í??ì?µë??ë?¤.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "ì?? ì?? ì??ë?? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤"
-
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "ì??ë²? ì??ë?µì?? ë¶?ì??í??ë??ë?° ì?¤í?¨í??ì?µë??ë?¤."
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "í??ì?¬"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "ì?¬ì?©ì??ì?? ë?¬ë ¥"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "ì??ë²? URLì?? ë°?ë??ë?° ì?¤í?¨í??ì?µë??ë?¤."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "ì?¬ì?©ì?? ë?¬ë ¥ì?? ì°¾ë?? ì¤?ì??ë??ë?¤..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "ì?¬ì?©ì?? ë?¬ë ¥ì?? í??ë??ë?? ì°¾ì?? ì?? ì??ì?µë??ë?¤."
 
@@ -16752,68 +16666,64 @@ msgstr "ì?´ì ? ì??ë??ê°? ì?¤í?¨í??ì?µë??ë?¤: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "ì?´ì ? ì??ë??ê°? ì?¤ë¥? ì½?ë?? %dë²?ì?¼ë¡? ì?¤í?¨í??ì?µë??ë?¤"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "ì?¬ì?©ì?? <b>%s</b>ì?? (<b>%s</b> ì??ë²?) ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
+msgid "Enter password for user %s on server %s"
+msgstr "ì?¬ì?©ì?? %sì?? (%s ì??ë²?) ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "URL '%s'ì?? ë³´ë?¼ SOUP ë©?ì??ì§?ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "í?´ë?? ë?´ì?©ì?? ê²?ì??í??ë?? ì¤?ì??ë??ë?¤..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "ì?¬ì?© ê°?ë?¥í?? ë?¬ë ¥ ëª©ë¡?:"
 
 # FIXME: ë¬´ì?¨ ì??ë¯¸ì?¸ì§? í??ì?¸ í??ì??
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "ì§?ì??"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "ì?¤ë ?ë??ë¥¼ ë§?ë??ë??ë?° ì?¤í?¨í??ì?µë??ë?¤: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "ì??ë²? URL '%s'ì??(ë??) ì?¬ë°?ë¥¸ URLì?´ ì??ë??ë??ë?¤"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "CalDAV ë?¬ë ¥ ì°¾ì??ë³´ê¸°"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "SSL ì?¬ì?©(_S)"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "ì??ë²?ì??ì?? ë?¬ë ¥ ì°¾ì??ë³´ê¸°(_E)"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "ì??ë¡? ê³ ì¹¨(_F):"
 
@@ -16825,31 +16735,31 @@ msgstr "CalDAV ê¸°ë?¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 msgid "CalDAV Support"
 msgstr "CalDAV ê¸°ë?¥"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "ì?¬ì?©ì?? ì§?ì ? ì?µì??(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "í??ì?¼ ì?´ë¦?(_N):"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "ë?¬ë ¥ í??ì?¼ì?? ì? í??í??ì?ì??ì?¤"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "ì?´ ë??"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "í??ì?¼ ë³?ê²½ë?  ë??"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "ì£¼ê¸°ì ?ì?¼ë¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "ì?½ê¸° ì ?ì?© ê°?ì ?(_O)"
 
@@ -16861,11 +16771,11 @@ msgstr "ë¡?ì»¬ ë?¬ë ¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 msgid "Local Calendars"
 msgstr "ë¡?ì»¬ ë?¬ë ¥"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "ë³´ì?? ì?°ê²°(_S):"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "ì?¬ì?©ì??ì?´ë¦?(_M):"
 
@@ -16913,26 +16823,26 @@ msgstr "ë? ì?¨: ë°¤í??ë?? ë§?ì??"
 msgid "Weather: Thunderstorms"
 msgstr "ë? ì?¨: í??í??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "ì??ì¹? ì? í??"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "ë?¨ì??(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "ë¯¸í?°ë²? (ì?ì?¨, ì?¼í?°ë¯¸í?° ë?±)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "ì??í??ë¦¬ì?¼ ë?¨ì?? (í??ì?¨, ì?¸ì¹? ë?±)"
 
@@ -16962,44 +16872,43 @@ msgstr "ì?°ë?½ì²?ì?? ì??ì¹?ë¥¼ í??ì??í??ë?? ì§?ë??ë¥¼ (ì??ì¹?ê°? ì??ë?? ê²½ì?°)
 msgid "Map for contacts"
 msgstr "ì?°ë?½ì²?ì?? ë??í?? ì§?ë??"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "ì??ë³¼ë£¨ì??ì?´ ê¸°ë³¸ ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?¸ì§? ê²?ì?¬"
+#: ../plugins/dbx-import/dbx-importer.c:232
+msgid "Select folder to import OE folder into"
+msgstr "ì??ì??ë£© ì?µì?¤í??ë ?ì?¤ í?´ë??ë¥¼ ê°?ì ¸ì?¬ í?´ë??ë¥¼ ì? í??í??ì?ì??ì?¤"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "ì??ë³¼ë£¨ì??ì?´ ì??ì??í?  ë??ë§?ë?¤, ê¸°ë³¸ ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?¸ì§? ì?¬ë¶?ë¥¼ ê²?ì?¬í?©ë??ë?¤."
+#: ../plugins/dbx-import/dbx-importer.c:251
+msgid "Importing Outlook Express data"
+msgstr "ì??ì??ë£© ì?µì?¤í??ë ?ì?¤ ë?°ì?´í?° ê°?ì ¸ì?¤ê¸°"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "ì??ì??í?  ë?? ì??ë³¼ë£¨ì??ì?´ ê¸°ë³¸ ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?¸ì§? í??ì?¸í?©ë??ë?¤."
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Import Outlook Express messages from DBX file"
+msgstr "DBX í??ì?¼ì?? ì??ì??ë£© ì?µì?¤í??ë ?ì?¤ ë©?ì??ì§?ë¥¼ ê°?ì ¸ì?µë??ë?¤"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "ê¸°ë³¸ ë©?ì?¼ í??ë¡?ê·¸ë?¨"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook DBX import"
+msgstr "ì??ì??ë£© DBX ê°?ì ¸ì?¤ê¸°"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "ì??ë³¼ë£¨ì??ì?? ê¸°ë³¸ ì ?ì??ë©?ì?¼ í??ë¡?ê·¸ë?¨ì?¼ë¡? í??ì??ê² ì?µë??ê¹??"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "ì??ì??ë£© ì?µì?¤í??ë ?ì?¤ 5/6 ê°?ì?¸ í?´ë?? (.dbx)"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "ê¸°ë³¸ ì£¼ì??ë¡?ì?¼ë¡? í??ì??(_D)"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "ì?´ ì£¼ì??ë¡?ì?¼ë¡? ì??ë?? ì??ì?±(_U)"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "ê¸°ë³¸ ë?¬ë ¥ì?¼ë¡? í??ì??(_D)"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "ê¸°ë³¸ ì??ì?? ëª©ë¡?ì?¼ë¡? í??ì??(_D)"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "ê¸°ë³¸ ë©?ëª¨ ëª©ë¡?ì?¼ë¡? í??ì??(_D)"
 
@@ -17041,7 +16950,7 @@ msgstr "ë³´í?¸"
 
 # FIXME: ì?´ê±° ë²?ì?í?´ì?¼ ë?¼? ì»¤ì?¤í?? í?¤ë??ì?? ì?°ë?? ê°?ì?? ì??ì ?.
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Secret"
 msgstr "ë¹?ë°?"
 
@@ -17057,12 +16966,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "ì?¬ì?©ì?? ì?¤ì ? í?¤ë??(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17070,12 +16979,12 @@ msgstr ""
 "ì?¬ì?©ì?? ì?¤ì ? í?¤ë?? ê°?ì?? ì§?ì ?í??ë?? í??ì??ì??:\n"
 "ì?¬ì?©ì?? ì?¤ì ? í?¤ë??ì?? í?¤ì?? ê°?ì?? \";\"ì?¼ë¡? êµ¬ë¶?í?©ë??ë?¤."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
 msgstr "í?¤"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:416
 msgid "Values"
 msgstr "ê°?"
 
@@ -17097,7 +17006,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "ë©?ì?¼ ì??ì?± ì°½ì??ì?? í?¤ë¥¼ ë??ë¥´ë©´ ì??ë??ì?¼ë¡? í?¸ì§?ê¸° ì?¤í??"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "ì?? ë©?ì?¼ì?? í?¸ì§?í?  ë?? ì??ë??ì?¼ë¡? ì?¤í??"
 
@@ -17109,11 +17018,11 @@ msgstr "ê¸°ë³¸ ì?¸ë¶? í?¸ì§?ê¸°"
 msgid "The default command that must be used as the editor."
 msgstr "í?¸ì§?ê¸°ë¡? ì?¬ì?©í?  ê¸°ë³¸ ëª?ë ¹ì?´."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "í?¸ì§?ê¸°ë¥¼ ì?¤í??í?  ëª?ë ¹ì?´: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17121,8 +17030,8 @@ msgstr ""
 "ì?´ë§¥ì?¤ì?? ê²½ì?° \"xemacs\"ë¥¼ ì?¬ì?©í??ê³ \n"
 "VIë?? \"gvim -f\"ë¥¼ ì?¬ì?©í??ì?ì??ì?¤"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "ì?¸ë¶? í?¸ì§?ê¸°ì??ì?? ì??ì?±"
 
@@ -17197,7 +17106,7 @@ msgstr "ê¸°ë³¸ê°?ì?¼ë¡? ì?¼êµ´ ì?¬ì§? ë?£ê¸°(_I)"
 msgid "Load new _Face picture"
 msgstr "ì?? ì?¼êµ´ ì?¬ì§? ì?½ì?´ë?¤ì?´ê¸°(_F)"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "ì?¼êµ´ ì?¬ì§? í?¬í?¨(_F)"
 
@@ -17229,22 +17138,17 @@ msgstr "í?´ë?¹ í??ì?¼ì?? ì?½ì?? ì?? ì??ì?µë??ë?¤"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "ì? í??í?? í??ì?¼ì?? ì?¬ë°?ë¥¸ PNG ê·¸ë¦¼ í??ì?¼ì?´ ì??ë??ë??ë?¤. ì?¤ë¥?: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "êµ¬ê¸?"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>ì??ë²?</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "ì??ë²?"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "êµ¬ë??í??ê³  ì??ë?? ë?¬ë ¥ ëª©ë¡?ì?? ì?½ì?¼ë ¤ë©´ %s ì?¬ì?©ì??ì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17253,18 +17157,18 @@ msgstr ""
 "êµ¬ê¸? ì??ë²?ì??ì?? ë?°ì?´í?°ë¥¼ ì?½ì?? ì?? ì??ì?µë??ë?¤.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
 msgid "Unknown error."
 msgstr "ì?? ì?? ì??ë?? ì?¤ë¥?."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "ë?¬ë ¥(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
 msgstr "ëª©ë¡? ê°?ì ¸ì?¤ê¸°(_L)"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -17275,7 +17179,7 @@ msgstr "êµ¬ê¸? ë?¬ë ¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
 msgid "Google Calendars"
 msgstr "êµ¬ê¸? ë?¬ë ¥"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "í??ì?¸ëª©ë¡?"
 
@@ -17307,12 +17211,12 @@ msgstr "ì??í?? ì?¼ì?? í??ì?©"
 msgid "Rese_nd Meeting..."
 msgstr "ëª¨ì?? ë?¤ì?? ë³´ë?´ê¸°(_N)..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Create folder"
 msgstr "í?´ë??ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17337,19 +17241,19 @@ msgstr ""
 "ê³µì?  í?´ë??ë¥¼ ì?¤ì¹?í??ë ¤ë©´ 'ì ?ì?©'ì?? ë??ë¥´ì?ì??ì?¤\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "ê³µì?  í?´ë?? ì?¤ì¹?"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "ê³µì?  í?´ë?? ì?¤ì¹?"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "ì ?í?¬ë©?ì?¼ ì?¤ì ?"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "ì ?í?¬ë©?ì?¼ ì?¤ì ?"
@@ -17362,11 +17266,6 @@ msgstr "ì ?ì??ë©?ì?¼:"
 msgid "Junk List:"
 msgstr "ì ?í?¬ë©?ì?¼ ëª©ë¡?:"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "ì?¬ì?© ì??ì??(_D)"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "ì?¬ì?©(_E)"
@@ -17385,7 +17284,7 @@ msgstr "ì ?ê±°(_R)"
 msgid "Message Retract"
 msgstr "ë©?ì??ì§? ì² í??"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17393,7 +17292,7 @@ msgstr ""
 "ë©?ì??ì§?ë¥¼ ì² í??í??ë©´ ë°?ë?? ì?¬ë??ì?? ë©?ì?¼í?¨ì??ì?? ì ?ê±°ë?  ì??ë?? ì??ì?µë??ë?¤. ì ?ë§?ë¡? ì² í??í??"
 "ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "ë©?ì??ì§?ë¥¼ ì?±ê³µì ?ì?¼ë¡? ì² í??í??ì?µë??ë?¤"
 
@@ -17514,25 +17413,25 @@ msgid "Would you like to decline it?"
 msgstr "ê±°ë¶?í??ì??ê² ì?µë??ê¹??"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>ì?¬ì?©ì??:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "ì??ë¦¼ ë©?ì??ì§? ì?¬ì?©ì?? ì?¤ì ?(_U)"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "ì?°ë?½ì²?(_T)..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "ê³µì?  í?´ë?? ì??ë¦¼"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "ì°¸ê°?ì??ë?? ë?¤ì?? ì??ë¦¼ì?? ë°?ê²? ë?©ë??ë?¤.\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "ì?¬ì?©ì??:"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "ê³µì?  ì??í?¨(_N)"
@@ -17591,50 +17490,57 @@ msgid "Proxy"
 msgstr "í??ë¡?ì??"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>ê³?ì ? ì?´ë¦?</b>"
+#: ../widgets/misc/e-account-tree-view.c:230
+msgid "Account Name"
+msgstr "ê³?ì ? ì?´ë¦?"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "í??ë¡?ì?? ë¡?ê·¸ì?¸"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s(ì?¬ì?©ì?? %s)ì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "í?´ë?¹ ê³?ì ?ì?´ ì?°ê²°ë?? ì??í??ì?¼ ê²½ì?°ì??ë§? í??ë¡?ì?? í?ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "í?´ë?¹ ê³?ì ?ì?? ì?¬ì?©í?  ê²½ì?°ì??ë§? í??ë¡?ì?? í?ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:700
+msgctxt "GW"
+msgid "Proxy"
+msgstr "í??ë¡?ì??"
+
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
 msgstr "ì?¬ì?©ì?? ì¶?ê°?"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "ê³ ê¸? ë³´ë?´ê¸° ì?µì??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "ì?¬ì?©ì??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:310
 msgid "Enter the users and set permissions"
 msgstr "ì?¬ì?©ì??ë¥¼ ì??ë ¥í??ì??ê³  ê¶?í??ì?? ì?¤ì ?í??ì?ì??ì?¤"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:410
 msgid "Sharing"
 msgstr "ê³µì? "
 
@@ -17642,67 +17548,63 @@ msgstr "ê³µì? "
 msgid "Custom Notification"
 msgstr "ì?¬ì?©ì?? ì§?ì ? ì??ë¦¼"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
 msgid "Add   "
 msgstr "ì¶?ê°?   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/share-folder.c:737
+msgid "Modify"
+msgstr "ì??ì ?"
+
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "ë©?ì??ì§? ì??í??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "ì ?ëª©:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "ë³´ë?¸ ì?¬ë??:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "ë§?ë?  ë? ì§?:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "ë°?ë?? ì?¬ë??: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "ì ?ë?¬: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "ì?´ê¸°: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "ì??ë?½: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "ì§?ì??: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "ê±°ë¶?: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "ì??ë£?: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "ì ?ë?¬ë??ì§? ì??ì??: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Hula ê¸°ë?¥ì?? ì??ë³¼ë£¨ì??ì?? ì¶?ê°?í?©ë??ë?¤."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Hula ê¸°ë?¥"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "ë?´ì?¥ ê·¸ë¦¼"
@@ -17711,12 +17613,12 @@ msgstr "ë?´ì?¥ ê·¸ë¦¼"
 msgid "View image attachments directly in mail messages."
 msgstr "ê·¸ë¦¼ì?? ë©?ì?¼ ë©?ì??ì§?ì??ì?? ì§?ì ? í??ì??í?©ë??ë?¤."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "ì?¬ì?©ì?? ì?¤ì ? í?¤ë??"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP í?¤ë??"
@@ -17762,35 +17664,37 @@ msgstr "IMAP ê³?ì ?ì?? ì?¸ë¶? ì?¬í?ì?? ì?¤ì ?í?©ë??ë?¤."
 msgid "IMAP Features"
 msgstr "IMAP ê¸°ë?¥"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
 #, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "'%s' ë?¬ë ¥ì?? ì?½ì?´ë?¤ì?´ë??ë?° ì?¤í?¨í??ì?µë??ë?¤"
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "'%s' ë?¬ë ¥ì?? ì?½ì?´ë?¤ì?´ë??ë?° ì?¤í?¨í??ì?µë??ë?¤ (%s)"
 
 # event -> í??ì?¬, Microsoft Office XP ì°¸ê³ 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' ë?¬ë ¥ì?? ë?¤ì?´ ì??ë?? ì?½ì??ì?´ ì?´ ëª¨ì??ê³¼ ì¶©ë??í?©ë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' ë?¬ë ¥ì?? ì?½ì??ì?? ë°?ê²¬í??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
 msgstr "ë?¬ë ¥ì?? í??ë??ë?? ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
 msgstr "ì?´ë?? ë?¬ë ¥ì??ì??ë?? ì?´ ëª¨ì??ì?? ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
 msgstr "ì?´ë?? ì??ì?? ëª©ë¡?ì??ì??ë?? ì?´ ì??ì??ì?? ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "ì?´ë?? ë©?ëª¨ ëª©ë¡?ì??ì??ë?? ì?´ ë©?ëª¨ë¥¼ ì°¾ì?? ì?? ì??ì?µë??ë?¤"
 
@@ -17846,7 +17750,7 @@ msgstr "ë??ë¦¬ì?¸ì??ê²? ì·¨ì?? ê³µì§?ë¥¼ ë³´ë?¼ ì?? ì??ì?µë??ë?¤"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "ì??ëª»ë?? ì??í??ë??ë¬¸ì?? ì°¸ì??ì?? ì??í??ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤"
+msgstr "ì??ëª»ë?? ì??í?? ë??ë¬¸ì?? ì°¸ì??ì?? ì??í??ë¥¼ ì??ë?°ì?´í?¸í?  ì?? ì??ì?µë??ë?¤"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1413
 #, c-format
@@ -17890,13 +17794,13 @@ msgstr "ë?¬ë ¥.ics"
 msgid "Save Calendar"
 msgstr "ë?¬ë ¥ ì ?ì?¥"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "ì²¨ë¶?í?? ë?¬ë ¥ì?´ ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17904,16 +17808,16 @@ msgstr ""
 "ë©?ì??ì§?ì?? ë?¬ë ¥ì?´ ë?¤ì?´ ì??ë?¤ê³  ë??ì?´ ì??ì?¼ë??, ê·¸ ë?¬ë ¥ì?´ ì?¬ë°?ë¥¸ iCalendarê°? ì??ë??ë??"
 "ë?¤."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1775
 msgid "The item in the calendar is not valid"
 msgstr "ë?¬ë ¥ ì??ì?´ í?ëª©ì?´ ì?¬ë°?ë¥´ì§? ì??ì?µë??ë?¤"
 
 # free/busy -> ì?½ì?? ì??ì??/ì??ì??, Microsoft Office XP ì°¸ê³ 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1776
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17921,515 +17825,510 @@ msgstr ""
 "ë©?ì??ì§?ì?? ë?¬ë ¥ì?´ ë?¤ì?´ ì??ì?¼ë??, ë?¬ë ¥ì?? í??ì?¬, ì??ì??, ì?½ì?? ì??ì??/ì??ì?? ì ?ë³´ê°? í??ë??ë?? "
 "ë?¤ì?´ ì??ì§? ì??ì?µë??ë?¤."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "ì²¨ë¶?í?? ë?¬ë ¥ì?? ì?¬ë?¬ ê°?ì?? í?ëª©ì?´ ë?¤ì?´ ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "ì?´ í?ëª©ì?? ëª¨ë?? ì²?ë¦¬í??ë ¤ë©´, í??ì?¼ì?? ì ?ì?¥í?´ì?? ê·¸ ë?¬ë ¥ì?? ê°?ì ¸ì??ì?¼ í?©ë??ë?¤."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This meeting recurs"
 msgstr "ì?´ ì?½ì?? ë°?ë³µ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This task recurs"
 msgstr "ì?´ ì??ì?? ë°?ë³µ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2460
 msgid "This memo recurs"
 msgstr "ì?´ ë©?ëª¨ ë°?ë³µ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "_Delete message after acting"
 msgstr "ì ?ì?©í?? ë?¤ì??ì?? ë©?ì??ì§? ì?ì ?(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2704
+#: ../plugins/itip-formatter/itip-formatter.c:2737
 msgid "Conflict Search"
 msgstr "ì¶©ë?? ê²?ì??"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ì¶©ë??í??ë?? ëª¨ì??ì?? ì°¾ì?? ë?¬ë ¥ì?? ì? í??í??ì?ì??ì?¤"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "ì?¤ë?? %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "ì?¤ë?? %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "ì?¤ë?? %p %l:%M:%S"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "ì?¤ë?? %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "ì?¤ë?? %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "ë?´ì?¼ %p %l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "ë?´ì?¼ %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%B %eì?¼ %A"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%B %eì?¼ %A, %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%B %eì?¼ %A, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%B %eì?¼ %A, %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%B %eì?¼ %A, %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%Yë?? %B %eì?¼ %A"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Yë?? %B %eì?¼ %A, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Yë?? %B %eì?¼ %A, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Yë?? %B %eì?¼ %A, %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Yë?? %B %eì?¼ %A, %p %l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "<b>%s</b> ì??ê²©ì?¼ë¡? ì??ë?µí??ì?ì??ì?¤."
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "<b>%s</b> ì??ê²©ì?¼ë¡? ë°?ì??"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤:"
-
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ëª¨ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤:"
+msgid "Please respond on behalf of %s"
+msgstr "%s ì??ê²©ì?¼ë¡? ì??ë?µí??ì?ì??ì?¤"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ëª¨ì??ì?? ì??ì??í??ì?µë??ë?¤:"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì??ì?? ì°¸ì??í??ì??ê¸°ë¥¼ ì??ì²í??ì?µë??ë?¤:"
+msgid "Received on behalf of %s"
+msgstr "%s ì??ê²©ì?¼ë¡? ë°?ì??"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ëª¨ì??ì?? ì°¸ì??í??ì??ê¸°ë¥¼ ì??ì²í??ì?µë??ë?¤:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ê¸°ì¡´ ëª¨ì??ì?? ì°¸ì??í??ê³  ì?¶ì?´í?©ë??ë?¤:"
+msgid "%s has published the following meeting information:"
+msgstr "%së??ì?´ ë?¤ì?? ëª¨ì?? ì ?ë³´ë¥¼ ê²?ì??í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b>ë??ì?´ ê¸°ì¡´ ëª¨ì??ì?? ì°¸ì??í??ê³  ì?¶ì?´í?©ë??ë?¤:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%së??ì?´ ë?¤ì?? ëª¨ì??ì?? ì??ì??í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì??ì?? ìµ?ì?  ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì??ì?? ì°¸ì??í??ì??ê¸°ë¥¼ ì??ì²í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ëª¨ì??ì?? ìµ?ì?  ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%së??ì?´ ë?¤ì?? ëª¨ì??ì?? ì°¸ì??í??ì??ê¸°ë¥¼ ì??ì²í??ì?µë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì??ê³¼ ê°?ì?? ëª¨ì?? ì??ë?µì?? ë³´ë??ì?µë??ë?¤:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ê¸°ì¡´ ëª¨ì??ì?? ì°¸ì??í??ê³  ì?¶ì?´í?©ë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì??ê³¼ ê°?ì?? ëª¨ì?? ì??ë?µì?? ë³´ë??ì?µë??ë?¤:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%së??ì?´ ê¸°ì¡´ ëª¨ì??ì?? ì°¸ì??í??ê³  ì?¶ì?´í?©ë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì??ì?? ì·¨ì??í??ì?µë??ë?¤:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì??ì?? ìµ?ì?  ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ëª¨ì??ì?? ì·¨ì??í??ì?µë??ë?¤."
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%së??ì?´ ë?¤ì?? ëª¨ì??ì?? ìµ?ì?  ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì?? ë³?ê²½ì?? ì ?ì??í??ì?µë??ë?¤."
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì??ê³¼ ê°?ì?? ëª¨ì?? ì??ë?µì?? ë³´ë??ì?µë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ëª¨ì?? ë³?ê²½ì?? ì ?ì??í??ì?µë??ë?¤."
+msgid "%s has sent back the following meeting response:"
+msgstr "%së??ì?´ ë?¤ì??ê³¼ ê°?ì?? ëª¨ì?? ì??ë?µì?? ë³´ë??ì?µë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì?? ë³?ê²½ì?? ê±°ì ?í??ì?µë??ë?¤:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì??ì?? ì·¨ì??í??ì?µë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ëª¨ì?? ë³?ê²½ì?? ê±°ì ?í??ì?µë??ë?¤."
+msgid "%s has canceled the following meeting."
+msgstr "%së??ì?´ ë?¤ì?? ëª¨ì??ì?? ì·¨ì??í??ì?µë??ë?¤."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ì??ì??ì?? ê²?ì??í??ì?µë??ë?¤:"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì?? ë³?ê²½ì?? ì ?ì??í??ì?µë??ë?¤."
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ì??ì??ì?? ê²?ì??í??ì?µë??ë?¤:"
+msgid "%s has proposed the following meeting changes."
+msgstr "%së??ì?´ ë?¤ì?? ëª¨ì?? ë³?ê²½ì?? ì ?ì??í??ì?µë??ë?¤."
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ì??ì??ì?? %së??ì?? í? ë?¹ì?? ì??ì²í??ì?µë??ë?¤:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ëª¨ì?? ë³?ê²½ì?? ê±°ì ?í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ì??ì??ì?? í? ë?¹í??ì?µë??ë?¤:"
+msgid "%s has declined the following meeting changes."
+msgstr "%së??ì?´ ë?¤ì?? ëª¨ì?? ë³?ê²½ì?? ê±°ì ?í??ì?µë??ë?¤."
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b>ë??ì?´ ì??ì??ì?? í? ë?¹í??ì?µë??ë?¤:"
+msgid "%s through %s has published the following task:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ì??ì??ì?? ê²?ì??í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ê¸°ì¡´ ì??ì??ì?? ì°¸ì?¬í??ê³  ì?¶ì?´í?©ë??ë?¤:"
+msgid "%s has published the following task:"
+msgstr "%së??ì?´ ë?¤ì?? ì??ì??ì?? ê²?ì??í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b>ë??ì?´ ê¸°ì¡´ ì??ì??ì?? ì°¸ì?¬í??ê³  ì?¶ì?´í?©ë??ë?¤:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%së??ì?´ ë?¤ì?? ì??ì??ì?? %së??ì?? í? ë?¹ì?? ì??ì²í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ì??ì?? í? ë?¹ì?? ìµ?ê·¼ ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ì??ì??ì?? í? ë?¹í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ì??ì?? í? ë?¹ì?? ìµ?ê·¼ ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤:"
+msgid "%s has assigned you a task:"
+msgstr "%së??ì?´ ì??ì??ì?? í? ë?¹í??ì?µë??ë?¤:"
 
-# FIXME: through what?
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ì??ì?? í? ë?¹ ì??ë?µì?? ë³´ë??ì?µë??ë?¤:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ê¸°ì¡´ ì??ì??ì?? ì°¸ì?¬í??ê³  ì?¶ì?´í?©ë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ì??ì?? í? ë?¹ ì??ë?µì?? ë³´ë??ì?µë??ë?¤:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%së??ì?´ ê¸°ì¡´ ì??ì??ì?? ì°¸ì?¬í??ê³  ì?¶ì?´í?©ë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? í? ë?¹ ì??ì??ì?? ì·¨ì??í??ì?µë??ë?¤:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ì??ì?? í? ë?¹ì?? ìµ?ê·¼ ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? í? ë?¹ ì??ì??ì?? ì·¨ì??í??ì?µë??ë?¤:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%së??ì?´ ë?¤ì?? ì??ì?? í? ë?¹ì?? ìµ?ê·¼ ì ?ë³´ë¥¼ ë°?ê³  ì?¶ì?´í?©ë??ë?¤:"
 
+# FIXME: through what?
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ì??ì?? í? ë?¹ ë³?ê²½ì?? ì ?ì??í??ì?µë??ë?¤:"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ì??ì?? í? ë?¹ ì??ë?µì?? ë³´ë??ì?µë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ì??ì?? í? ë?¹ ë³?ê²½ì?? ì ?ì??í??ì?µë??ë?¤:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%së??ì?´ ë?¤ì?? ì??ì?? í? ë?¹ ì??ë?µì?? ë³´ë??ì?µë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ì??ì?? í? ë?¹ì?? ê±°ì ?í??ì?µë??ë?¤:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? í? ë?¹ ì??ì??ì?? ì·¨ì??í??ì?µë??ë?¤:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ì??ì?? í? ë?¹ì?? ê±°ì ?í??ì?µë??ë?¤:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%së??ì?´ ë?¤ì?? í? ë?¹ ì??ì??ì?? ì·¨ì??í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ë©?ëª¨ë¥¼ ê²?ì??í??ì?µë??ë?¤:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ì??ì?? í? ë?¹ ë³?ê²½ì?? ì ?ì??í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ë©?ëª¨ë¥¼ ê²?ì??í??ì?µë??ë?¤:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%së??ì?´ ë?¤ì?? ì??ì?? í? ë?¹ ë³?ê²½ì?? ì ?ì??í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ì??ì?? í? ë?¹ì?? ê±°ì ?í??ì?µë??ë?¤:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%së??ì?´ ë?¤ì?? ì??ì?? í? ë?¹ì?? ê±°ì ?í??ì?µë??ë?¤:"
+
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ê¸°ì¡´ ë©?ëª¨ì?? ë?´ì?©ì?? ì¶?ê°?í??ê³  ì?¶ì?´í?©ë??ë?¤:"
+msgid "%s through %s has published the following memo:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ë©?ëª¨ë¥¼ ê²?ì??í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b>ë??ì?´ ê¸°ì¡´ ë©?ëª¨ì?? ë?´ì?©ì?? ì¶?ê°?í??ê³  ì?¶ì?´í?©ë??ë?¤:"
+msgid "%s has published the following memo:"
+msgstr "%së??ì?´ ë?¤ì?? ë©?ëª¨ë¥¼ ê²?ì??í??ì?µë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b>ë??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ê³µì?  ë©?ëª¨ë¥¼ ì·¨ì??í??ì?µë??ë?¤:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ê¸°ì¡´ ë©?ëª¨ì?? ë?´ì?©ì?? ì¶?ê°?í??ê³  ì?¶ì?´í?©ë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b>ë??ì?´ ë?¤ì?? ê³µì?  ë©?ëª¨ë¥¼ ì·¨ì??í??ì?µë??ë?¤:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%së??ì?´ ê¸°ì¡´ ë©?ëª¨ì?? ë?´ì?©ì?? ì¶?ê°?í??ê³  ì?¶ì?´í?©ë??ë?¤:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:562
+#, c-format
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%së??ì?´ %sì??(ë¥¼) í?µí?´ ë?¤ì?? ê³µì?  ë©?ëª¨ë¥¼ ì·¨ì??í??ì?µë??ë?¤:"
+
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%së??ì?´ ë?¤ì?? ê³µì?  ë©?ëª¨ë¥¼ ì·¨ì??í??ì?µë??ë?¤:"
+
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "í??ë£¨ ì¢?ì?¼:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "ì??ì?? ë? ì§?:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "ì??ì?? ì??ê°?:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "ë?? ë? ì§?:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "ë§?ì¹¨ ì??ê°?:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "ë?¬ë ¥ ì?´ê¸°(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "ê±°ë¶?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "í??ì?©(_A)"
-
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
+msgstr "ì??ë?½(_C)"
+
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "ëª¨ë?? ê±°ë¶?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "ëª¨ë?? ì? ì ?ì ?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "ì? ì ?ì ?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
-msgstr "ëª¨ë?? í??ì?©(_A)"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
+msgstr "ëª¨ë?? ì??ë?½(_C)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "ì ?ë³´ ë³´ë?´ê¸°(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "ì°¸ì??ì?? ì??í?? ì??ë?°ì?´í?¸(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "ì??ë?°ì?´í?¸(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "ì?¤ëª?:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "ë³´ë?¸ ì?´ì??ê²? í??ì? (_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "ì°¸ì??ì??ì??ê²? ì??ë?°ì?´í?¸ ë³´ë?´ê¸°(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "ëª¨ë?  ê²½ì?°ì?? ì ?ì?©(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "ì??ê°?ì?? ì?½ì?? ì??ì??ì?¼ë¡? í??ì??(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "ë?´ ë¯¸ë¦¬ ì??ë¦¼ ì? ì§?(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "ë¯¸ë¦¬ ì??ë¦¼ ì??ì??(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "ì??ì??(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "ë©?ëª¨(_M):"
 
@@ -18442,17 +18341,14 @@ msgid "Itip Formatter"
 msgstr "ITIP í?¬ë§¤í?°"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr ""
-"&quot;{0}&quot;ì?´(ê°?) ëª¨ì??ì?? ì??ì??í??ì?µë??ë?¤. {1} ë??ë¦¬ì?¸ì?? ì¶?ê°?í??ì??ê² ì?µë??ê¹??"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "'{0}'ì?´(ê°?) ëª¨ì??ì?? ì??ì??í??ì?µë??ë?¤. {1} ë??ë¦¬ì?¸ì?? ì¶?ê°?í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "ì?´ ëª¨ì??ì?? ì??ì??ë??ì??ì?µë??ë?¤"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
@@ -18463,22 +18359,18 @@ msgid "Beep or play sound file."
 msgstr "ì?? ì??ë¦¬ë¥¼ ë?´ê±°ë?? ì?¬ì?´ë?? í??ì?¼ ì?¬ì??."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Blink icon in notification area."
-msgstr "ì??ë¦¼ ì??ì?ì??ì?? ì??ì?´ì½? ê¹?ë°?ì?´ê¸°."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
 msgstr "D-Bus ë©?ì??ì§? ì?¬ì?©."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "ì??ë¦¼ ì??ì?ì??ì?? ì??ì?´ì½? ì?¬ì?©."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ë©´ D-BUS ë©?ì??ì§?ê°? ë°?ì??í?©ë??ë?¤."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
@@ -18486,65 +18378,60 @@ msgstr ""
 "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ì?? ë?? ì°¸ì?´ë©´ ì?? ì??ë¦¬ë¥¼ ë?´ê³ , ì??ë??ë©´ ì?¬ì?´ë?? í??ì?¼ì?? í??ë ?ì?´í?©"
 "ë??ë?¤."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Notify new messages for Inbox only."
 msgstr "ë°?ì?? í?¸ì§?í?¨ì?? ê²½ì?°ì??ë§? ì?? ë©?ì??ì§? ì??ë¦¼."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Play sound when new messages arrive."
 msgstr "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ë©´ ì?¬ì?´ë?? ì?¬ì??."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ë©´ (ì?? ì??ë¦¬ ëª¨ë??ê°? ì??ë?? ê²½ì?°) í??ë§? ì?¬ì?´ë??ë¥¼ ì?¬ì??í?©ë??ë?¤."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
 msgstr "ì??ì?´ì½?ê³¼ ê°?ì?´ ë©?ì??ì§? í??ì?? í??ì??."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ì?? ë?? ì??ë¦¼ ì??ì?ì?? ì?? ë©?ì?¼ ì??ì?´ì½? í??ì??."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "ì?¬ì??í?  ì?¬ì?´ë?? í??ì?¼ ì?´ë¦?."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ë©´ ì?¬ì??í?  ì?¬ì?´ë?? í??ì?¼, ì?? ì??ë¦¬ ëª¨ë??ê°? ì??ë?? ê²½ì?°."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "ì?¬ì?´ë?? í??ë§? ì?¬ì?©"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ë©´ ì?¬ì?´ë??ë¥¼ ì?¬ì??í? ì§? ì?? ì??ë¦¬ë¥¼ ë?¼ì§?."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ë©´ ì??ì?´ì½? ì??ì?? ë©?ì??ì§?ë¥¼ í??ì??í? ì§? ì?¬ë¶?."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "ì??ì?´ì½?ì?? ê¹?ë°?ì?¼ì§? ì?¬ë¶?."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ë°?ì?? í?¸ì§?í?¨ í?´ë??ì??ë§? ì?? ë©?ì??ì§?ë¥¼ ì??ë¦´ì§? ì?¬ë¶?."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:352
 msgid "Evolution's Mail Notification"
 msgstr "ì??ë³¼ë£¨ì?? ë©?ì?¼ ì??ë¦¼"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:374
 msgid "Mail Notification Properties"
 msgstr "ë©?ì?¼ ì??ë¦¼ ì??ì?±"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18556,66 +18443,64 @@ msgstr[0] ""
 "ì??ë¡? %dê°?ì?? ë©?ì??ì§?ë¥¼ ë°?ì??ì?µë??ë?¤.\n"
 "(%s í?´ë??)"
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "From: %s"
 msgstr "ë³´ë?¸ ì?¬ë??: %s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:532
 #, c-format
 msgid "Subject: %s"
 msgstr "ì ?ëª©: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:542
 #, 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:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:559
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "New email"
 msgstr "ì?? ë©?ì?¼"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:627
 msgid "Show icon in _notification area"
 msgstr "ì??ë¦¼ ì??ì?ì??ì?? ì??ì?´ì½? í??ì??(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
-msgid "B_link icon in notification area"
-msgstr "ì??ë¦¼ ì??ì?ì??ì?? ì??ì?´ì½? ê¹?ë°?ì?´ê¸°(_L)"
-
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:656
 msgid "Popup _message together with the icon"
 msgstr "ì??ì?´ì½?ê³¼ ê°?ì?´ ë©?ì??ì§? í??ì?? í??ì??(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when new messages arrive"
 msgstr "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ë©´ ì?¬ì?´ë?? ì?¬ì??(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:872
 msgid "_Beep"
 msgstr "ì?? ì??ë¦¬(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:885
 msgid "Use sound _theme"
 msgstr "ì?¬ì?´ë?? í??ë§? ì?¬ì?©(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:904
 msgid "Play _file:"
 msgstr "í??ì?¼ ì?¬ì??(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:915
 msgid "Select sound file"
 msgstr "ì?¬ì?´ë?? í??ì?¼ì?? ê³ ë¥´ì?ì??ì?¤"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:973
 msgid "Notify new messages for _Inbox only"
 msgstr "ë°?ì?? í?¸ì§?í?¨ì?? ê²½ì?°ì??ë§? ì?? ë©?ì??ì§? ì??ë¦¼(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:982
 msgid "Generate a _D-Bus message"
 msgstr "D-Bus ë©?ì??ì§? ë³´ë?´ê¸°(_D)"
 
@@ -18628,12 +18513,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "ì?? ë©?ì??ì§?ê°? ë??ì°©í??ë©´ ì??ë¦½ë??ë?¤."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "%s ë©?ì?¼ì??ì?? ë§?ë?¤ì?´ì§?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18641,7 +18526,7 @@ msgid ""
 msgstr ""
 "ì? í??í?? ë?¬ë ¥ì?? ì?´ë¯¸ '%s' í??ì?¬ê°? ë?¤ì?´ ì??ì?µë??ë?¤. ì??ì ? í??ì?¬ë¥¼ í?¸ì§?í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18649,7 +18534,7 @@ msgid ""
 msgstr ""
 "ì? í??í?? ë?¬ë ¥ì?? ì?´ë¯¸ '%s' ì??ì??ì?´ ë?¤ì?´ ì??ì?µë??ë?¤. ì??ì ? ì??ì??ì?? í?¸ì§?í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18657,7 +18542,10 @@ msgid ""
 msgstr ""
 "ì? í??í?? ë?¬ë ¥ì?? ì?´ë¯¸ '%s' ë©?ëª¨ê°? ë?¤ì?´ ì??ì?µë??ë?¤. ì??ì ? ë©?ëª¨ë¥¼ í?¸ì§?í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18665,7 +18553,10 @@ msgstr ""
 "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ì?¼ì?? ë??í?? í??ì?¬ê°? ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? í??ì?¬ë¥¼ ë§?"
 "ë??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18673,7 +18564,10 @@ msgstr ""
 "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ì?¼ì?? ë??í?? ì??ì??ì?´ ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? ì??ì??ì?? ë§?"
 "ë??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18681,7 +18575,10 @@ msgstr ""
 "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ëª¨ì?? ë??í?? ë©?ëª¨ê°? ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? ë©?ëª¨ë¥¼ ë§?"
 "ë??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18692,7 +18589,10 @@ msgstr[0] ""
 "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ëª¨ì?? ë??í?? í??ì?¬ê°? ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? í??ì?¬ë¥¼ ë§?"
 "ë??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18703,7 +18603,10 @@ msgstr[0] ""
 "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ì?¼ì?? ë??í?? ì??ì??ì?´ ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? ì??ì??ì?? ë§?"
 "ë??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18714,25 +18617,25 @@ msgstr[0] ""
 "ì? í??í?? ë?¬ë ¥ì?? í?´ë?¹ ë©?ëª¨ì?? ë??í?? ë©?ëª¨ê°? ì?´ë¯¸ ë?¤ì?´ ì??ì?µë??ë?¤. ê·¸ë??ë?? ì?? ë©?ëª¨ë¥¼ ë§?"
 "ë??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[ì??ì?½ ì??ì??]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "ì??ë²?ì??ì?? ì?¬ë°?ë¥´ì§? ì??ì?? ì?¤ë¸?ì ?í?¸ë¥¼ ë°?ì??ì?µë??ë?¤"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "ì²?ë¦¬ ì¤? ì?¤ë¥?ê°? ë°?ì??í??ì?µë??ë?¤: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ë?¬ë ¥ì?? ì?´ ì?? ì??ì?µë??ë?¤. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:743
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18740,7 +18643,7 @@ msgstr ""
 "ì? í??í?? ì??ì?¤ê°? ì?½ê¸° ì ?ì?©ì?´ë?¼ì?? ì?¬ê¸°ì?? í??ì?¬ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤. ë?¤ë¥¸ ì??ì?¤ë¥¼ ì? "
 "í??í??ì?ì??ì?¤."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18748,7 +18651,7 @@ msgstr ""
 "ì? í??í?? ì??ì?¤ê°? ì?½ê¸° ì ?ì?©ì?´ë?¼ì?? ì?¬ê¸°ì?? ì??ì??ì?? ë§?ë?¤ ì?? ì??ì?µë??ë?¤. ë?¤ë¥¸ ì??ì?¤ë¥¼ ì? "
 "í??í??ì?ì??ì?¤."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:749
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18756,40 +18659,40 @@ msgstr ""
 "ì? í??í?? ì??ì?¤ê°? ì?½ê¸° ì ?ì?©ì?´ë?¼ì?? ì?¬ê¸°ì?? ë©?ëª¨ë¥¼ ë§?ë?¤ ì?? ì??ì?µë??ë?¤. ë?¤ë¥¸ ì??ì?¤ë¥¼ ì? "
 "í??í??ì?ì??ì?¤."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ì??ì?¤ ëª©ë¡?ì?? ë°?ì?? ì?? ì??ì?µë??ë?¤. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create an _Event"
 msgstr "í??ì?¬ ë§?ë?¤ê¸°(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1073
 msgid "Create a new event from the selected message"
 msgstr "ì? í??í?? ë©?ì??ì§?ì??ì?? ì?? í??ì?¬ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a Mem_o"
 msgstr "ë©?ëª¨ ë§?ë?¤ê¸°(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1080
 msgid "Create a new memo from the selected message"
 msgstr "ì? í??í?? ë©?ì??ì§?ì??ì?? ì?? ë©?ëª¨ë¥¼ ë§?ë?ë??ë?¤"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1085
 msgid "Create a _Task"
 msgstr "ì??ì?? ë§?ë?¤ê¸°(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1087
 msgid "Create a new task from the selected message"
 msgstr "ì? í??í?? ë©?ì??ì§?ì??ì?? ì?? ì??ì??ì?? ë§?ë?ë??ë?¤"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1095
 msgid "Create a _Meeting"
 msgstr "ëª¨ì?? ë§?ë?¤ê¸°(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1097
 msgid "Create a new meeting from the selected message"
 msgstr "ì? í??í?? ë©?ì??ì§?ì??ì?? ì?? ëª¨ì??ì?? ë§?ë?ë??ë?¤"
 
@@ -18797,55 +18700,55 @@ msgstr "ì? í??í?? ë©?ì??ì§?ì??ì?? ì?? ëª¨ì??ì?? ë§?ë?ë??ë?¤"
 msgid "Convert a mail message to a task."
 msgstr "ë©?ì?¼ ë©?ì??ì§?ë¥¼ ì??ì??ì?¼ë¡? ë°?ê¿?ë??ë?¤."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
 msgid "Get List _Archive"
 msgstr "ë¦¬ì?¤í?¸ ì??ì¹´ì?´ë¸? ë°?ê¸°(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get an archive of the list this message belongs to"
 msgstr "ì?´ ë©?ì??ì§?ê°? ì??í?? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ì??ì¹´ì?´ë¸?ë¥¼ ë°?ì?µë??ë?¤"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
 msgid "Get List _Usage Information"
 msgstr "ë¦¬ì?¤í?¸ ì?¬ì?© ì ?ë³´ ë°?ê¸°(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "ì?´ ë©?ì??ì§?ê°? ì??í?? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ì?¬ì?©ë°©ë²? ì ?ë³´ë¥¼ ë°?ì?µë??ë?¤"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
 msgid "Contact List _Owner"
 msgstr "ë¦¬ì?¤í?¸ ë?´ë?¹ì??ì??ê²? ì?°ë?½(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "ì?´ ë©?ì??ì§?ê°? ì??í?? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ì??ì? ì??ì??ê²? ì?°ë?½í?©ë??ë?¤"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
 msgid "_Post Message to List"
 msgstr "ë¦¬ì?¤í?¸ì?? ë©?ì??ì§? ë³´ë?´ê¸°(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "ì?´ ë©?ì??ì§?ê°? ì??í?? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ë©?ì??ì§?ë¥¼ ê²?ì??í?©ë??ë?¤"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
 msgid "_Subscribe to List"
 msgstr "ë¦¬ì?¤í?¸ì?? ê°?ì??(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "ì?´ ë©?ì??ì§?ê°? ì??í?? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì?? ê°?ì??í?©ë??ë?¤"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
 msgid "_Unsubscribe from List"
 msgstr "ë¦¬ì?¤í?¸ì??ì?? í??í?´(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "ì?´ ë©?ì??ì§?ê°? ì??í?? ë©?ì?¼ë§? ë¦¬ì?¤í?¸ì??ì?? í??í?´í?©ë??ë?¤"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
 msgid "Mailing _List"
 msgstr "ë©?ì?¼ë§? ë¦¬ì?¤í?¸(_L)"
 
@@ -18946,15 +18849,15 @@ msgstr ""
 "í??ì?¬ í?´ë??ë§? ì?½ì?? ë©?ì??ì§?ë¡? í??ì??í??ì??ê² ì?µë??ê¹?? ì??ë??ë©´ í??ì?¬ í?´ë??ì?? ê·¸ ì??ë?? í?´ë??"
 "ì?? ëª¨ë?  ë©?ì??ì§?ë¥¼ ëª¨ë?? ì?½ì?? ë©?ì??ì§?ë¡? í??ì??í??ì??ê² ì?µë??ê¹??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "í??ì?¬ í?´ë?? ë°? í??ì?? í?´ë??ì??ì??(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "í??ì?¬ í?´ë??ì??ì??ë§?(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:439
 msgid "Mark Me_ssages as Read"
 msgstr "ë©?ì??ì§?ë¥¼ ì?½ì?? ê²?ì?¼ë¡? í??ì??(_S)"
 
@@ -19014,19 +18917,19 @@ msgstr "ì?¼ë°? í??ì?¤í?¸ ì? í?¸"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ë©?ì?¼ ë©?ì??ì§?ì?? HTMLì?´ ì??ë??ë?¼ë?? ì?¼ë°? í??ì?¤í?¸ë¡? ë´?ë??ë?¤."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "HTMLì?´ ì??ì?¼ë©´ í??ì??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "ì??ë³¼ë£¨ì??ì??ì?? ì??ì??ì?? ë³´ê¸° ì¢?ì?? ë¶?ë¶?ì?? í??ì??."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "ì?¼ë°? í??ì?¤í?¸ê°? ì??ì?¼ë©´ í??ì??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19034,22 +18937,22 @@ msgstr ""
 "ì?¼ë°? í??ì?¤í?¸ê°? ì??ì?¼ë©´ í??ì??í??ê³ , ì?¼ë°? í??ì?¤í?¸ê°? ì??ì?¼ë©´ ì??ë³¼ë£¨ì??ì??ì?? ë³´ì?¬ì¤? ë¶?ë¶?"
 "ì?? ê³¨ë?¼ ì¤?ë??ë?¤."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "ì?¼ë°? í??ì?¤í?¸ë§? í??ì??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 "í?ì?? ì?¼ë°? í??ì?¤í?¸ ë¶?ë¶?ë§? í??ì??í??ê³ , ë?¤ë¥¸ ë¶?ë¶?ì?? í??ì??í??ë©´ ì²¨ë¶? í??ì?¼ë¡? ë§?ë?ë??ë?¤."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "HTML ë¶?ë¶?ì?? ì?¨ê¸°ê³  ì²¨ë¶?ë¡? í??ì??(_U)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HTML ëª¨ë??(_M)"
 
@@ -19073,32 +18976,36 @@ msgstr "ì??ì??ë£© PST ê°?ì ¸ì?¤ê¸°"
 msgid "Outlook personal folders (.pst)"
 msgstr "ì??ì??ë£© ê°?ì?¸ í?´ë?? (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
 msgid "_Mail"
 msgstr "ë©?ì?¼(_M)"
 
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "ë??ì?? í?´ë??:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
 msgid "_Address Book"
 msgstr "ì£¼ì??ë¡?(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
 msgid "A_ppointments"
 msgstr "ì?½ì??(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "ì??ì??(_T)"
 
 # journal -> ì?¼ì§?, Microsoft Office XP ì°¸ê³ 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
 msgstr "ì?¼ì§? í?ëª©(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
 msgid "Importing Outlook data"
 msgstr "ì??ì??ë£© ë?°ì?´í?° ê°?ì ¸ì?¤ê¸°"
 
@@ -19266,47 +19173,47 @@ msgstr "ì?? ì??ì¹?"
 msgid "Edit Location"
 msgstr "ì??ì¹? í?¸ì§?"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "ì?¤í?¸ì?´ì??ì? ì?´ ì??ì?µë??ë?¤. ì½?ë??: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "í??ì?´í??ë¥¼ ë§?ë??ë??ë?° ì?¤í?¨í??ì?µë??ë?¤: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "í??ë¡?ì?¸ì?¤ ë§?ë?  ë?¤ì?? ì?¤ë¥?: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "ì?¤í?¸ì?´ì??ì?  í??ì?? í??ë¡?ì?¸ì?¤ê°? ì??ë?µí??ì§? ì??ì?µë??ë?¤. ê°?ì ?ë¡? ë??ë??ë??ë?¤..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "ì?¤í?¸ì?´ì??ì?  í??ì?? í??ë¡?ì?¸ì?¤ ë??ê¸°ê°? ì¤?ì§?ë??ì??ì?µë??ë?¤. ê°?ì ?ë¡? ë??ë??ë??ë?¤..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "ì?¤í?¸ì?´ì??ì? ì?? ë??í?? í??ì?´í??ê°? ì?¤í?¨í??ì?µë??ë?¤. ì?¤ë¥? ì½?ë??: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "ì?¤í?¸ì?´ì??ì? ì?? ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤. ì?¤ì¹?ë¥¼ ë¨¼ì ? í??ì?ì??ì?¤."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "ì?´ë ?ê²? í??ë©´ ì?¤í?¸ì?´ì??ì? ì?´ ë?? ì??ì ?ì ?ì?¼ë¡? ì??ë??í??ì§?ë§?, ë?? ë??ë¦½ë??ë?¤"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
 msgid "I_nclude remote tests"
 msgstr "ì??ê²© í??ì?¤í?¸ í?¬í?¨(_N)"
 
@@ -19423,78 +19330,26 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF í??ì?? (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "í??ì??(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "ë??ì?? í??ì?¼ ì? í??"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "ì? í??í?? ë?¬ë ¥ì?? ë??ì?¤í?¬ì?? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "ì? í??í?? ë©?ëª¨ ëª©ë¡?ì?? ë??ì?¤í?¬ì?? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "ì? í??í?? ì??ì?? ëª©ë¡?ì?? ë??ì?¤í?¬ì?? ì ?ì?¥í?©ë??ë?¤"
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "ìµ?ì´?ì?? ê³?ì ? ì?¤ì ?ì?? í?  ë?? ì??ë?´í?©ë??ë?¤."
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "ì?¤ì ? ë??ì?°ë¯¸"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "ì??ë³¼ë£¨ì?? ì?¤ì ? ë??ì?°ë¯¸"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "í??ì??í?©ë??ë?¤"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-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"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"ì??ë³¼ë£¨ì??ì?? ì?¬ì?©í??ê²? ë??ì?  ê²?ì?? í??ì??í?©ë??ë?¤. ë?¤ì??ì?? ì?¬ ëª? ê°?ì?? í??ë©´ì??ì?? ì??ë³¼ë£¨ì??"
-"ì?¼ë¡? ì ?ì??ë©?ì?¼ ê³?ì ?ì?? ì?°ê²°í??ë??ë¡? ì?¤ì ?í??ê³ , ë?¤ë¥¸ í??ë¡?ê·¸ë?¨ì??ì?? ì?°ë?? í??ì?¼ë?¤ì?? ê°?"
-"ì ¸ì?¤ê²? ë?©ë??ë?¤.\n"
-"\n"
-"ê³?ì??í??ì??ë ¤ë©´ \"ì??ì?¼ë¡?\" ë?¨ì¶?ë¥¼ ë??ë¥´ì?ì??ì?¤. "
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "ë?¤ì??ì??ì?? ê°?ì ¸ì?¤ê³  ì?¶ì?? ì ?ë³´ë¥¼ ì? í??í??ì?ì??ì?¤:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "%sì??ì??:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "í??ì?¼ ê°?ì ¸ì?¤ê¸°"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "ë?°ì?´í?°ë¥¼ ê°?ì ¸ì?¤ë?? ì¤?ì??ë??ë?¤."
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "ì? ì?? ê¸°ë?¤ë¦¬ì?ì??ì?¤"
-
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
 msgstr "ë©?ì?¼ ë©?ì??ì§? ê¸?í??ë??ë¥¼ ì ?ëª© ì??ì??ë¡? ì ?ë ¬í?©ë??ë?¤."
@@ -19508,7 +19363,7 @@ msgid "Thread messages by subject"
 msgstr "ì ?ëª©ì?? ë?°ë?¼ ë©?ì??ì§?ë¥¼ ê¸?í??ë??ë¡? í??ì??í?©ë??ë?¤"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "ì?°ê´?ë?? ë©?ì??ì§?ê°? ì??ë??ë??ë?¼ë?? ì ?ëª©ì?? ë?°ë?¼ ê¸?í??ë??ë¡? ë§?ë?¤ê¸°(_A)"
 
@@ -19522,15 +19377,15 @@ msgstr "ì??ì?? í??ë?¬ê·¸ì?¸ì??ì?? ë©?ì??ì§? ë³¸ë¬¸ ë??ì?  ì?¬ì?©í?  í?¤/ê°? ì??
 msgid "Drafts based template plugin"
 msgstr "ë©?ì?¼ ì´?ì?? ê¸°ì¤? ì??ì?? í??ë?¬ê·¸ì?¸"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:621
 msgid "No Title"
 msgstr "ì ?ëª© ì??ì??"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:715
 msgid "Save as _Template"
 msgstr "ì??ì??ì?¼ë¡? ì ?ì?¥(_T)"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:717
 msgid "Save as Template"
 msgstr "ì??ì??ì?¼ë¡? ì ?ì?¥"
 
@@ -19550,26 +19405,26 @@ msgstr "ë?´ì?¥ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "vCardë¥¼ ë©?ì?¼ ë©?ì??ì§?ì??ì?? ì§?ì ? í??ì??í?©ë??ë?¤."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:181
+#: ../plugins/vcard-inline/vcard-inline.c:266
 msgid "Show Full vCard"
 msgstr "vCard ì??ì?¸í?? ë³´ê¸°"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:184
 msgid "Show Compact vCard"
 msgstr "vCard ê°?ë?¨í?? ë³´ê¸°"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "There is one other contact."
 msgstr "ê¸°í?? ì?°ë?½ì²?ê°? í?? ê°? ì??ì?µë??ë?¤."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:254
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "ê¸°í?? ì?°ë?½ì²?ê°? %dê°? ì??ì?µë??ë?¤."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:275
 msgid "Save in Address Book"
 msgstr "ì£¼ì??ë¡?ì?? ì ?ì?¥"
 
@@ -19585,11 +19440,11 @@ msgstr "WebDAV ì?°ë?½ì²?"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "IfMatch í?¼í??ê¸°(_A) (ì??í??ì¹? 2.2.8 ë¯¸ë§? ë²?ì ?ì??ì?? í??ì??)"
 
@@ -19749,7 +19604,7 @@ msgstr "ë³´ì¡° ëª¨ì??ì?? í??ì??í?©ë??ë?¤"
 msgid "Skip development warning dialog"
 msgstr "ê°?ë°? ë²?ì ? ê²½ê³  ê±´ë?? ë?°ê¸°"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:332
 msgid "Start in offline mode"
 msgstr "ì?°ê²° ì¤?ì§? ì??í??ì??ì?? ì??ì??"
 
@@ -19902,144 +19757,47 @@ msgstr "ì°½ ë?¨ì¶? ëª¨ì??ì??"
 msgid "Window buttons are visible"
 msgstr "ì°½ ë?¨ì¶? í??ì??í? ì§? ì?¬ë¶?"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:528 ../shell/e-shell-content.c:529
 msgid "Searches"
 msgstr "ê²?ì??"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:571
 msgid "Save Search"
 msgstr "ê²?ì?? ì ?ì?¥"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:929
 msgid "Sho_w:"
 msgstr "ë³´ê¸°(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:960
 msgid "Sear_ch:"
 msgstr "ê²?ì??(_C):"
 
 # FIXME - hard to translate UI + string based on English grammar
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1021
 msgid "i_n"
 msgstr " ì??ì¹?(_N)"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "ë??êµ¬ ëª¨ì?? ëª¨ì??"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "ì ?í?? ë?¨ì¶? ë??êµ¬ ëª¨ì?? ëª¨ì??"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "ë??êµ¬ ëª¨ì?? í??ì??"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "ì ?í?? ë?¨ì¶?ë¥¼ í??ì??í? ì§? ì?¬ë¶?"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "ëª¨ë?  í??ì?¼ (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "ì ?í?? ë?¨ì¶? ë??ì??"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "ì?´ ì?¸ ë·°ì?? ì ?í?? ë?¨ì¶? ë??ì??"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "í??ì?´ì§? ë²?í?¸"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "ì?¸ ë·°ì?? ë?¸í?¸ë¶? í??ì?´ì§? ë²?í?¸"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "ê²?ì?? ê·?ì¹?"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "í??ì?¬ ê²?ì?? ê²°ê³¼ì?? ê²?ì?? ê¸°ì¤?"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "ì?´ ì?¸ ë·°ì?? EShellBackend"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "ì?¸ ë?´ì?© ì??ì ¯"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr "ì?¸ ì°½ì?? ì?¤ë¥¸ìª½ ì°½ì?? ë??í??ë??ë?? ë?´ì?© ì??ì ¯"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "ì?¸ ë³´ì¡° ëª¨ì?? ì??ì ¯"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "ì?¸ ì°½ì?? ì?¼ìª½ ì°½ì?? ë??í??ë??ë?? ë³´ì¡° ëª¨ì?? ì??ì ¯"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "ì?¸ ë??êµ¬ ëª¨ì?? ì??ì ¯"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "ì?¸ ì°½ì?? ì??ë??ì?? ë??í??ë??ë?? ë??êµ¬ ëª¨ì?? ì??ì ¯"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "ì?¸ ì°½"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "ì?¸ ë·°ê°? ë?¤ì?´ ì??ë?? ì°½"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "ì??ì ¯ ì??í?? ë?°ì?´í?°ê°? ë?¤ì?´ ì??ë?? í?¤ í??ì?¼"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "ì?¸ ë·°ì?? ì ?ëª©"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "í??ì?¬ ë·° ID"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "í??ì?¬ GAL ë·° ID"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20051,435 +19809,331 @@ msgstr "GNOME Korea <gnome-kr googlegroups com>"
 msgid "Evolution Website"
 msgstr "ì??ë³¼ë£¨ì?? ì?¹ì?¬ì?´í?¸"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Bug Buddy is not installed."
 msgstr "ë²?ê·¸ë²?ë??ë¥¼ ì?¤ì¹?í??ì§? ì??ì??ì?µë??ë?¤."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1238
 msgid "Bug Buddy could not be run."
 msgstr "ë²?ê·¸ë²?ë??ë¥¼ ì?¤í??í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../shell/e-shell-window-actions.c:1343
-msgid "GNOME Pilot is not installed."
-msgstr "ê·¸ë?? í??ì?¼ë?¿ì?? ì?¤ì¹?í??ì§? ì??ì??ì?µë??ë?¤."
-
-#: ../shell/e-shell-window-actions.c:1345
-msgid "GNOME Pilot could not be run."
-msgstr "ê·¸ë?? í??ì?¼ë?¿ì?? ì?¤í??í?  ì?? ì??ì?µë??ë?¤."
-
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1419
 msgid "Show information about Evolution"
 msgstr "ì??ë³¼ë£¨ì??ì?? ë??í?? ì ?ë³´ë¥¼ ë³´ì?¬ì¤?ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1438
 msgid "_Close Window"
 msgstr "ì°½ ë?«ê¸°(_C)"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1445
 msgid "_Contents"
 msgstr "ì°¨ë¡?(_C)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1447
 msgid "Open the Evolution User Guide"
 msgstr "ì??ë³¼ë£¨ì?? ì?¬ì?©ì?? ì??ë?´ì??ë¥¼ ì?½ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1473
 msgid "Evolution _FAQ"
 msgstr "ì??ë³¼ë£¨ì?? ì??ì£¼ í??ë?? ì§?ë¬¸(_F)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1475
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "ì??ì£¼í??ë?? ì§?ë¬¸ ì?¹í??ì?´ì§?ë¥¼ ì?½ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1480
 msgid "_Forget Passwords"
 msgstr "ì ?ì?¥í?? ì??í?¸ ì´?ê¸°í??(_F)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1482
 msgid "Forget all remembered passwords"
 msgstr "ì ?ì?¥í?? ëª¨ë?  ì??í?¸ë¥¼ ì´?ê¸°í??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1487
 msgid "I_mport..."
 msgstr "ê°?ì ¸ì?¤ê¸°(_M)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1489
 msgid "Import data from other programs"
 msgstr "ë?¤ë¥¸ í??ë¡?ê·¸ë?¨ì??ì?? ë?°ì?´í?°ë¥¼ ê°?ì ¸ì?µë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1494
 msgid "New _Window"
 msgstr "ì?? ì°½(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1496
 msgid "Create a new window displaying this view"
 msgstr "ì?´ ë·°ë¥¼ ì?? ì°½ì?? ë§?ë?ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1510
 msgid "Configure Evolution"
 msgstr "ì??ë³¼ë£¨ì?? ì?¤ì ?"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1515
 msgid "_Quick Reference"
 msgstr "ì§§ì?? ì°¸ì¡° ë¬¸ì??(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1517
 msgid "Show Evolution's shortcut keys"
 msgstr "ì??ë³¼ë£¨ì?? ë°?ë¡? ê°?ê¸° í?¤ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1524
 msgid "Exit the program"
 msgstr "í??ë¡?ê·¸ë?¨ì?? ë??ë??ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1529
 msgid "_Advanced Search..."
 msgstr "ê³ ê¸? ê²?ì??(_A)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1531
 msgid "Construct a more advanced search"
 msgstr "ë?? ë³µì?¡í?? ê³ ê¸? ê²?ì??ì?? ì??í??í?©ë??ë?¤"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1538
 msgid "Clear the current search parameters"
 msgstr "í??ì?¬ ê²?ì?? í??ë?¼ë¯¸í?°ë¥¼ ì§?ì??ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1543
 msgid "_Edit Saved Searches..."
 msgstr "ì ?ì?¥í?? ê²?ì?? í?¸ì§?(_E)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1545
 msgid "Manage your saved searches"
 msgstr "ì ?ì?¥í?? ê²?ì??ì?? ê´?ë¦¬í?©ë??ë?¤"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1552
 msgid "Click here to change the search type"
 msgstr "ê²?ì?? ì¢?ë¥?ë¥¼ ë°?ê¾¸ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1557
 msgid "_Find Now"
 msgstr "ì§?ê¸? ì°¾ê¸°(_F)"
 
 # tooltip
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1559
 msgid "Execute the current search parameters"
 msgstr "í??ì?¬ ê²?ì?? í??ë?¼ë¯¸í?°ë¥¼ ì?¤í??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1564
 msgid "_Save Search..."
 msgstr "ê²?ì?? ì ?ì?¥(_S)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1566
 msgid "Save the current search parameters"
 msgstr "í??ì?¬ ê²?ì?? í??ë?¼ë¯¸í?°ë¥¼ ì ?ì?¥í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1578
 msgid "Send / _Receive"
 msgstr "ë³´ë?´ê³  ë°?ê¸°(_R)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1580
 msgid "Send queued items and retrieve new items"
 msgstr "ë°?ë¦° ë©?ì?¼ì?? ë³´ë?´ê³  ì?? ë©?ì?¼ì?? ë°?ì?µë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1585
 msgid "Submit _Bug Report..."
 msgstr "ë²?ê·¸ ì ?ë³´(_B)..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1587
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ë²?ê·¸ë²?ë??ë¡? ë²?ê·¸ì ?ë³´ë¥¼ í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1598
-msgid "GNOME Pilot _Synchronization..."
-msgstr "ê·¸ë?? í??ì?¼ë?¿ ë??ê¸°í??(_S)..."
-
-# tooltip
-#: ../shell/e-shell-window-actions.c:1600
-msgid "Set up GNOME Pilot configuration"
-msgstr "ê·¸ë?? í??ì?¼ë?¿ì?? ì?¤ì ?í?©ë??ë?¤"
-
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1592
 msgid "_Work Offline"
 msgstr "ì?°ê²° ì¤?ì§? ì??í?? ì??ì??(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1594
 msgid "Put Evolution into offline mode"
 msgstr "ì??ë³¼ë£¨ì??ì?? ì?°ê²° ì¤?ì§? ì??í??ë¡? ë°?ê¿?ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
 msgstr "ì?°ê²° ì??í?? ì??ì??(_W)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Put Evolution into online mode"
 msgstr "ì??ë³¼ë£¨ì??ì?? ì?°ê²° ì??í??ë¡? ë°?ê¿?ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1629
 msgid "Lay_out"
 msgstr "ë°°ì¹?(_O)"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1636
 msgid "_New"
 msgstr "ì??ë¡? ë§?ë?¤ê¸°(_N)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1643
 msgid "_Search"
 msgstr "ê²?ì??(_S)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1650
 msgid "_Switcher Appearance"
 msgstr "ì ?í?? ë?¨ì¶? ëª¨ì??(_S)"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1664
 msgid "_Window"
 msgstr "ì°½(_W)"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1693
 msgid "Show Side _Bar"
-msgstr "ë³´ì¡° ëª¨ì?? ë³´ê¸°(_B)"
+msgstr "ë³´ì¡° ëª¨ì?? ë³´ì?´ê¸°(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show the side bar"
 msgstr "ë³´ì¡° ëª¨ì??ì?? í??ì??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show _Buttons"
-msgstr "ë?¨ì¶? ë³´ê¸°(_B)"
+msgstr "ë?¨ì¶? ë³´ì?´ê¸°(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show the switcher buttons"
 msgstr "ì ?í?? ë?¨ì¶?ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Status Bar"
 msgstr "ì??í?? í??ì??ì¤? ë³´ê¸°(_S)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show the status bar"
 msgstr "ì??í?? í??ì??ì¤?ì?? í??ì??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Tool Bar"
-msgstr "ë??êµ¬ ëª¨ì?? ë³´ê¸°(_T)"
+msgstr "ë??êµ¬ ëª¨ì?? ë³´ì?´ê¸°(_T)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1719
 msgid "Show the tool bar"
 msgstr "ë??êµ¬ ëª¨ì??ì?? í??ì??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1741
 msgid "_Icons Only"
 msgstr "ì??ì?´ì½?ë§?(_I)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1743
 msgid "Display window buttons with icons only"
 msgstr "ì??ì?´ì½?ë§? ì?¬ì?©í?´ ì°½ ë?¨ì¶?ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1748
 msgid "_Text Only"
 msgstr "í??ì?¤í?¸ë§?(_T)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Display window buttons with text only"
 msgstr "í??ì?¤í?¸ë§? ì?¬ì?©í?´ ì°½ ë?¨ì¶?ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1755
 msgid "Icons _and Text"
 msgstr "ì??ì?´ì½? ë°? í??ì?¤í?¸(_A)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Display window buttons with icons and text"
 msgstr "ì??ì?´ì½?ê³¼ í??ì?¤í?¸ë¥¼ ì?¬ì?©í?´ ì°½ ë?¨ì¶?ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1762
 msgid "Tool_bar Style"
 msgstr "ë??êµ¬ ëª¨ì?? ëª¨ì??(_B)"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1764
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "ë?°ì?¤í?¬í?± ë??êµ¬ ëª¨ì?? ì?¤ì ?ì?? ì?¬ì?©í?´ ì°½ ë?¨ì¶?ë¥¼ í??ì??í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Define Views..."
 msgstr "ë³´ê¸° ì§?ì ?..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Create or edit views"
 msgstr "ë³´ê¸°ë¥¼ ë§?ë?¤ê±°ë?? í?¸ì§?í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Save Custom View..."
 msgstr "ì?¬ì?©ì?? ë³´ê¸° ì ?ì?¥..."
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Save current custom view"
 msgstr "í??ì?¬ ì?¬ì?©ì?? ì ?ì?? ë·°ë¥¼ ì ?ì?¥í?©ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1788
 msgid "C_urrent View"
 msgstr "í??ì?¬ ë³´ê¸°(_U)"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Custom View"
 msgstr "ì?¬ì?©ì?? ë³´ê¸°"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1800
 msgid "Current view is a customized view"
 msgstr "í??ì?¬ ë·°ë?? ì?¬ì?©ì?? ì ?ì?? ë·°ì??ë??ë?¤"
 
 # tooltip
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Change the page settings for your current printer"
 msgstr "í??ì?¬ í??ë¦°í?°ì?? í??ì?´ì§? ì?¤ì ?ì?? ë°?ê¿?ë??ë?¤"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2183
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ì°½ì?¼ë¡? ë°?ê¾¸ê¸°"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2396
 msgid "Execute these search parameters"
 msgstr "ì?´ ê²?ì?? í??ë?¼ë¯¸í?°ë¥¼ ì?¤í??í?©ë??ë?¤"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - ì??ë³¼ë£¨ì??"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:419
 msgid "New"
 msgstr "ì??ë¡? ë§?ë?¤ê¸°"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "ì?¬ì?© ì¤?ì?¸ ì?¸ ë·°"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "ì?¬ì?© ì¤?ì?¸ ì?¸ ë·°ì?? ì?´ë¦?"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "ì?¸ ì°½ì?? EFocusTracker"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "í?¬ê¸° ë°? ì??ì¹?"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "ì°½ í?¬ê¸° ë°? ì??ì¹? ì§?ì ? ë¬¸ì??ì?´"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "ì??ì ? ëª¨ë??"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "ì?¸ ì°½ì?´ ì??ì ? ëª¨ë??ì?? ì??ë??ì§? ì?¬ë¶?"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "ë³´ì¡° ëª¨ì?? í??ì??"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "ì?¸ ì°½ì?? ë³´ì¡° ëª¨ì??ì?? í??ì??í??ë??ì§? ì?¬ë¶?"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "ì ?í?? ë?¨ì¶? í??ì??"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "ì?¸ ì°½ì?? ì ?í?? ë?¨ì¶?ë¥¼ í??ì??í? ì§? ì?¬ë¶?"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "ì??í?? í??ì??ì¤? í??ì??"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "ì?¸ ì°½ì?? ì??ì?? í??ì??ì¤?ì?? í??ì??í? ì§? ì?¬ë¶?"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "ì?¸ ì°½ì?? ë??êµ¬ ëª¨ì??ì?? í??ì??í? ì§? ì?¬ë¶?"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "ì?¬ì?©ì?? ì?¸í?°í??ì?´ì?¤ ê´?ë¦¬ì??"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "ì?¸ ì°½ì?? GtkUIManager"
-
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:244
 msgid "Preparing to go offline..."
 msgstr "ì?°ê²° ì¤?ì§? ì??í??ë¡? ì?´ë??í??ë?? ì¤?ë¹? ì¤?..."
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:294
 msgid "Preparing to go online..."
 msgstr "ì?°ê²° ì??í??ë¡? ì?´ë??í??ë?? ì¤?ë¹? ì¤?..."
 
 # ì£¼ì??: ë?¤ë¥¸ ë©?ì??ì§?ì?? ì?¼ë¶?ë¡? ì?°ì?¸ë?¤. ë¬¸ì?¥ì?¼ë¡? ë²?ì?í??ì§? ë§? ê²?.
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:353
 msgid "Preparing to quit..."
 msgstr "ë??ë?¼ ì¤?ë¹? ì¤?..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "ëª¨ë?? ë??ë ?í?°ë¦¬"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "EModuleì?? ì?½ì?´ë?¤ì?¼ ë??ë ?í?°ë¦¬"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "ë?¤í?¸ì??í?¬ ì?¬ì?© ê°?ë?¥"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "ë?¤í?¸ì??í?¬ê°? ì?¬ì?© ê°?ë?¥í??ì§? ì?¬ë¶?"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "ì?°ê²° ì¤?"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "ì?¸ì?´ ì?°ê²° ì¤?ì?¸ì§? ì?¬ë¶?"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:181
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20513,7 +20167,7 @@ msgstr ""
 "ì?°ë¦¬ê°? ì?´ì?¬í?? ì?¼í?? ê²°ê³¼ë¬¼ì?? ì?? ì?¨ ì£¼ì??ê¸¸ ë°?ë??ë??ë?¤. ê·¸ë¦¬ê³  ê°?ë°?ì??\n"
 "ê¸°ì?¬í?´ ì£¼ì??ê¸°ë¥¼ ëª©ì?´ ë¹ ì§?ê²? ê¸°ë?¤ë¦¬ê² ì?µë??ë?¤!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:205
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20521,59 +20175,55 @@ msgstr ""
 "ê³ ë§?ì?µë??ë?¤\n"
 "ì??ë³¼ë£¨ì?? í??\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:212
 msgid "Do not tell me again"
 msgstr "ë?¤ì?? ì??ë¦¬ì§? ì??ê¸°"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:328
 msgid "Start Evolution activating the specified component"
 msgstr "ì??ë³¼ë£¨ì?? ì??ì??í?  ë?? í?¹ì ? ì»´í?¬ë??í?¸ë¥¼ í??ì?±í??í?©ë??ë?¤"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:330
 msgid "Apply the given geometry to the main window"
 msgstr "í?´ë?¹ í?¬ê¸°ì?? ì??ì¹?ë¥¼ ë©?ì?¸ ì°½ì?? ì ?ì?©í?©ë??ë?¤"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:334
 msgid "Start in online mode"
 msgstr "ì?°ê²° ì??í??ì??ì?? ì??ì??"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:336
 msgid "Start in \"express\" mode"
 msgstr "\"ê³ ì??\" ëª¨ë??ì??ì?? ì??ì??"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:339
 msgid "Forcibly shut down Evolution"
 msgstr "ê°?ì ?ë¡? ì??ë³¼ë£¨ì??ì?? ë??ë??ë??ë?¤"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "ê°?ì ?ë¡? ì??ë³¼ë£¨ì?? 1.4ì??ì?? ë?¤ì?? ì?®ê²¨ ì?µë??ë?¤"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:342
 msgid "Send the debugging output of all components to a file."
 msgstr "ëª¨ë?  ì»´í?¬ë??í?¸ì?? ë??ë²?ê¹? ì¶?ë ¥ì?? í??ì?¼ë¡? ë³´ë??ë??ë?¤."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:344
 msgid "Disable loading of any plugins."
 msgstr "í??ë?¬ê·¸ì?¸ì?? ì??ë¬´ê²?ë?? ì?½ì?´ë?¤ì?´ì§? ì??ì?µë??ë?¤."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:346
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ì ?ì??ë©?ì?¼, ì?°ë?½ì²?, ì??ì??ì?? ë¯¸ë¦¬ ë³´ê¸° ì°½ì?? ì?¬ì?©í??ì§? ì??ì?µë??ë?¤."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:350
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "ë?¤ì?? ì?¸ì??ì?? ì?´ URIì?? í??ì?¼ì?´ë¦?ì?? ê°?ì ¸ì?µë??ë?¤."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:352
 msgid "Request a running Evolution process to quit"
 msgstr "ì?¤í?? ì¤?ì?¸ ì??ë³¼ë£¨ì?? í??ë¡?ì?¸ì?¤ì?? ë??ë?´ë?? ì??ì²ì?? í?©ë??ë?¤"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:476 ../shell/main.c:484
 msgid "- The Evolution PIM and Email Client"
 msgstr "- ì??ë³¼ë£¨ì?? ê°?ì?¸ì ?ë³´ ê´?ë¦¬ ë°? ë©?ì?¼ í?´ë?¼ì?´ì?¸í?¸"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:546
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20587,96 +20237,44 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "ì ?ë§?ë¡? ì ?ì?¥í??ë?? ëª¨ë?  ì??í?¸ë¥¼ ì´?ê¸°í??í??ì??ê² ì?µë??ê¹??"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "ê³?ì??"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "{0} ë²?ì ?ì??ì?? ì§?ì ? ì??ê·¸ë ?ì?´ë??í??ì??ê² ì?µë??ê¹??"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "{0} ë²?ì ?ì??ì?? ê³¼ê±° ë?°ì?´í?°ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
+msgid "Continue Anyway"
+msgstr "ê·¸ë??ë?? ê³?ì??"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"ì??ë³¼ë£¨ì??ì?? ì?´ì ? {0} ë²?ì ?ì??ì?? ì??ê·¸ë ?ì?´ë??ë¥¼ ì§?ì??í??ì§? ì??ì?µë??ë?¤. ë??ì? ì?? ì??ë³¼ë£¨ì?? "
+"ë²?ì ? 2ë¡? ë¨¼ì ? ì??ê·¸ë ?ì?´ë??í?? ë?¤ì??ì??, ë?¤ì?? ë²?ì ? 3ì?¼ë¡? ì??ê·¸ë ?ì?´ë??í?  ì??ë?? ì??ì?µë??"
+"ë?¤."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "ì??í?¸ë¥¼ ì´?ê¸°í??í??ë©´ ì ?ì?¥í??ë?? ëª¨ë?  ì??í?¸ë¥¼ ì§?ì??ë??ë?¤. ë?¤ì??ì?? ì??í?¸ê°? í??ì??í?  ë?? ë?¤"
 "ì?? ë¬¼ì?´ë³´ê²? ë?©ë??ë?¤."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "ì??ê·¸ë ?ì?´ë??ì?? í??ì??í?? ë??ì?¤í?¬ ê³µê°?ì?´ ë¶?ì¡±í?©ë??ë?¤."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "ì ?ë§?ë¡? ê³¼ê±°ì?? ë?°ì?´í?°ë¥¼ ì?ì ?í??ì??ê² ì?µë??ê¹??"
+msgid "Quit Now"
+msgstr "ì§?ê¸? ë??ë?´ê¸°"
 
 #: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
-msgstr ""
-"&quot;evolution&quot; ë??ë ?í?°ë¦¬ì?? ì ?ì²´ ë?´ì?©ì?? ì??ì ?í?? ì ?ê±°í??ê²? ë?©ë??ë?¤.\n"
-"\n"
-"ê³¼ê±° ë?°ì?´í?°ë¥¼ ì§?ì?°ê¸° ì ?ì?? ì??ë??ì?¼ë¡? ëª¨ë?  ë©?ì?¼, ì?°ë?½ì²?, ë?¬ë ¥ ë?°ì?´í?°ê°? ì?¨ì ?í??ê²? "
-"ë?¨ì?? ì??ë?? ì§?, ê·¸ë¦¬ê³  ì?´ ë²?ì ?ì?? ì??ë³¼ë£¨ì??ì?´ ì?¬ë°?ë¥´ê²? ë??ì??í??ë??ì§? í??ì?¸í??ë?? ê²? ì¢?"
-"ì?µë??ë?¤.\n"
-"\n"
-"ì?¼ë?¨ ë?°ì?´í?°ë¥¼ ì§?ì?°ë©´ ì??ë??ì?¼ë¡? ì¡°ì??í??ì§? ì??ê³ ì??ë?? ê³¼ê±° ë²?ì ? ì??ë³¼ë£¨ì??ì?¼ë¡? ë?¤ì?´ê·¸"
-"ë ?ì?´ë??í?  ì?? ì??ì?µë??ë?¤.\n"
-
-#: ../shell/shell.error.xml.h:14
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"ì?´ì ? ë²?ì ?ì?? ì??ë³¼ë£¨ì??ì?? ë?°ì?´í?°ë¥¼ ì§?ê¸? ë²?ì ?ê³¼ ë?¤ë¥¸ ì??ì¹?ì?? ì ?ì?¥í??ì?µë??ë?¤.\n"
-"\n"
-"ì?´ ë?°ì?´í?°ë¥¼ ì§?ì?´ë?¤ë©´, &quot;evolution&quot; ë??ë ?í?°ë¦¬ì?? ëª¨ë?  ë?´ì?©ì?? ì??ì ?í?? ì ?"
-"ê±°í??ê²? ë?©ë??ë?¤. ì?´ ë?°ì?´í?°ë¥¼ ì? ì§?í??ë?¤ë©´, ë??ì¤?ì?? ì§?ì?°ê³  ì?¶ì?? ë?? ì??ë??ì?¼ë¡? &quot;"
-"evolution*&quot;ì?? ë?´ì?©ì?? ì ?ê±°í??ë©´ ë?©ë??ë?¤.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "ì?´ì ? ë²?ì ?ì??ì?? ì??ê·¸ë ?ì?´ë??í??ë??ë?° ì?¤í?¨:"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"ë?°ì?´í?°ì?? ì?¤ì ?ì?? ì??ê·¸ë ?ì?´ë??í??ë©´ {0}ì?? ë??ì?¤í?¬ ê³µê°?ì?´ í??ì??í?©ë??ë?¤. í??ì§?ë§? {1}ë§? "
-"ë?¨ì?? ì??ì?µë??ë?¤.\n"
-"\n"
-"ê³?ì?? í??ì??ê¸° ì ?ì??, í?? ë??ë ?í?°ë¦¬ì?? ê³µê°?ì?? ë?? í??ë³´í?´ì?¼ í?©ë??ë?¤."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "ì??í?¸ ì´?ê¸°í??(_F)"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "ë?°ì?´í?° ì? ì§?(_K)"
-
-# Reminder -> ë¯¸ë¦¬ ì??ë¦¼, Microsoft Office XP
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "ë??ì¤?ì?? ì??ë¦¼(_R)"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20768,7 +20366,7 @@ msgstr "ì?¸ì?? ê´?ë¦¬ ì?µì??:"
 msgid "Show session management options"
 msgstr "ì?¸ì?? ê´?ë¦¬ ì?µì??ì?? í??ì??í?©ë??ë?¤"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20797,67 +20395,75 @@ msgstr ""
 "ì?´ ì?¸ì¦?ì??ë¥¼ ë°?ê¸?í?? ì?¸ì¦? ê¸°ê´?ì?? ì? ë¢°í??ì§? ì??ë??ë?¤ê³  í??ì?¨ì?¼ë¯?ë¡?, ë?°ë¡? ì§?ì ?í??ì§? ì??"
 "ë?? í?? ì?´ ì?¸ì¦?ì??ë¥¼ ë¯¿ì??ë§? í??ë?¤ê³  ì? ë¢°í??ì§? ì??ì?µë??ë?¤."
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "ê°?ì ¸ì?¬ ì?¸ì¦?ì??ë¥¼ ì? í??í??ì?ì??ì?¤..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "ëª¨ë?  PKCS12 í??ì?¼"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "ëª¨ë?  í??ì?¼"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+msgid "Failed to import user's certificate"
+msgstr "ì?¬ì?©ì?? ì?¸ì¦?ì??ë¥¼ ê°?ì ¸ì?¤ë??ë?° ì?¤í?¨í??ì?µë??ë?¤"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "ì?¸ì¦?ì?? ì?´ë¦?"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "ëª©ì ?"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "ì?¼ë ¨ ë²?í?¸"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "ë§?ë£?"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "ëª¨ë?  ì ?ì??ë©?ì?¼ ì?¸ì¦? í??ì?¼"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+msgid "Failed to import contact's certificate"
+msgstr "ì?°ë?½ì²?ì?? ì?¸ì¦?ì??ë¥¼ ê°?ì ¸ì?¤ë??ë?° ì?¤í?¨í??ì?µë??ë?¤"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "ì ?ì??ë©?ì?¼ ì£¼ì??"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "ëª¨ë?  CA ì?¸ì¦?ì?? í??ì?¼"
 
-#: ../smime/gui/certificate-manager.c:1050
-msgid "Certificates"
-msgstr "ì?¸ì¦?ì??"
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr "ì?¸ì¦? ê¸°ê´?ì?? ì?¸ì¦?ì??ë¥¼ ê°?ì ¸ì?¤ë??ë?° ì?¤í?¨í??ì?µë??ë?¤"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "ì?¸ì¦?ì?? ë³´ê¸°: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s'ì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
+msgid "Enter the password for '%s'"
+msgstr "'%s'ì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -20887,7 +20493,7 @@ msgstr ""
 "ë°?ê¸?ì??:\n"
 "  ì??ì? ì??: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "ì?¸ì¦?ì?? ì? í??"
 
@@ -20900,14 +20506,10 @@ msgid "Authorities"
 msgstr "ê¸°ê´?"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "ë°±ì??"
+msgid "Backup _All"
+msgstr "ëª¨ë?? ë°±ì??(_A)"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "ëª¨ë?? ë°±ì??"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20915,162 +20517,154 @@ msgstr ""
 "ì?´ë?¤ ëª©ì ?ì?´ë?  ì?´ ì?¸ì¦?ê¸°ê´?ì?? ì? ë¢°í??ê¸° ì ?ì??, ê·¸ ì?¸ì¦?ì??ì?? ì ?ì±?ê³¼ (ì??ë?¤ë©´) í??ë¡?ì??"
 "ì ?ë¥¼ í??ì?¸í?´ì?¼ í?©ë??ë?¤."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "ì?¸ì¦?ì??"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "ì?¸ì¦? ê¸°ê´? ì? ë¢°ì??ì¤?"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "ì?¸ì¦?ì?? í??ë??"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "ì?¸ì¦?ì?? ê³?ì¸µ êµ¬ì¡°"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "ì?¸ì¦?ì?? ì??ì?¸ ì ?ë³´"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "ì?¸ì¦?ì?? í??"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "ê³µí?µ ì?´ë¦? (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "ì?°ë?½ì²? ì?¸ì¦?ì??"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "ì?´ ì?¸ì¦?ì??ê°? ë¯¿ì??ë§? í?? ì§? ì? ë¢°í??ì§? ì??ì??"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "í?¸ì§?"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "ì ?ì??ë©?ì?¼ ì?¸ì¦?ì?? ì? ë¢°ì??ì¤? ì?¤ì ?"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "ì ?ì??ë©?ì?¼ ë°?ë?? ì?¬ë?? ì?¸ì¦?ì??"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "ì ?ì??ë©?ì?¼ ì??ëª?í?? ì?¬ë?? ì?¸ì¦?ì??"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "ë§?ë£? ë? ì§?:"
 
 # ì?¸ì¦?ì?? í??ë?? ê°?
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "í??ë?? ê°?"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "í??ê±°í??ë¦°í?¸"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "ê°?ì ¸ì?¤ê¸°"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "ë°?ê¸?ì??:"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "ë°?ê¸? ë? ì§?:"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "ë°?ê¸? ë??ì??:"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5 í??ê±°í??ë¦°í?¸"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "ì¡°ì§? (Organization, O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "ì??ì?? êµ¬ë¶? (Organizational Unit, OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 í??ê±°í??ë¦°í?¸"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL í?´ë?¼ì?´ì?¸í?¸ ì?¸ì¦?ì??"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL ì??ë²? ì?¸ì¦?ì??"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "ì?´ ì?¸ì¦?ì??ë?? ë?¤ì?? ì?¬ì?©ì?? ë??í?´ í??ì?¸ë??ì??ì?µë??ë?¤:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "ì?´ ì?¸ì¦?ì??ê°? ë¯¿ì??ë§? í??ë?¤ê³  ì? ë¢°í?©ë??ë?¤"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "ì ?ì??ë©?ì?¼ ì?¬ì?©ì??ë¥¼ í??ì?¸í?  ë?? ì?´ ì?¸ì¦?ê¸°ê´?ì?? ì? ë¢°í?©ë??ë?¤."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "ì??í??í?¸ì?¨ì?´ ê°?ë°?ì??ë¥¼ í??ì?¸í?  ë?? ì?´ ì?¸ì¦?ê¸°ê´?ì?? ì? ë¢°í?©ë??ë?¤."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
 msgstr "ì?¹ ì?¬ì?´í?¸ë¥¼ í??ì?¸í?  ë?? ì?´ ì?¸ì¦?ê¸°ê´?ì?? ì? ë¢°í?©ë??ë?¤."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "ì? í?¨ ê¸°ê°?"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "ë³´ê¸°"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "ì?´ ì?¸ì¦? ê¸°ê´?ì??ì?? ë??ë¥¼ í??ì?¸í?  ì?? ì??ë?? ì?¸ì¦?ì??ë¥¼ ê°?ì§?ê³  ì??ì?µë??ë?¤:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "ì?´ ì?¸ì¦? ê¸°ê´?ì?? í??ì?¸í?  ì?? ì??ë?? ì?¸ì¦?ì??ê°? ì??ì?µë??ë?¤:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "ì?´ ì?¬ë??ë?¤ì?? í??ì?¸í?  ì?? ì??ë?? ì?¸ì¦?ì??ê°? ì??ì?µë??ë?¤:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "ë?´ ì?¸ì¦?ì??"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
+msgid "_Backup"
+msgstr "ë°±ì??(_B)"
+
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
 msgstr "ì?¸ì¦? ê¸°ê´? ì? ë¢°ì??ì¤? í?¸ì§?(_E)"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "ì?¸ì¦?ì??ê°? ì?´ë¯¸ ì??ì?µë??ë?¤"
 
@@ -21115,125 +20709,143 @@ msgstr "PKCS #1 MD5, RSA ì??í?¸í??"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1, RSA ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256, RSA ì??í?¸í??"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384, RSA ì??í?¸í??"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512, RSA ì??í?¸í??"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "ì?¸ì¦?ì?? í?¤ ì?©ë??"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "ë?·ì?¤ì¼?ì?´í?? ì?¸ì¦?ì?? í??ì??"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "ì?¸ì¦? ê¸°ê´? í?¤ ID"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ì?¤ë¸?ì ?í?¸ ID (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "ì??ê³ ë¦¬ì¦? ID"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "ì??ê³ ë¦¬ì¦? ì?¸ì??"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "ì??ì? ì?? ê³µê°? í?¤ ì ?ë³´"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "ì??ì? ì?? ê³µê°? í?¤ ì??ê³ ë¦¬ì¦?"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "ì??ì? ì??ì?? ê³µê°? í?¤"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "ì?¤ë¥?: ì¶?ê°? í?ëª©ì?? ì²?ë¦¬í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "ì?¤ë¸?ì ?í?¸ ì??ëª?ì??"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "SSL ì?¸ì¦? ê¸°ê´?"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "ì ?ì??ë©?ì?¼ ì?¸ì¦? ê¸°ê´?"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "ì??ëª?"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "ê±°ë¶?í?  ì?? ì??ì??"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "í?¤ ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "ë?°ì?´í?° ì??í?¸í??"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "í?¤ ê³?ì?½"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "ì?¸ì¦?ì?? ì??ëª?ì??"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "CRL ì??ëª?ì??"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "ì¤?ì??í?¨"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "ì¤?ì??í??ì§? ì??ì??"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "í??ì?¥ ê¸°ë?¥"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "ì?¸ì¦?ì?? ì??ëª? ì??ê³ ë¦¬ì¦?"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "ë°?ê¸?ì??"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "ë°?ê¸?ì?? ê³ ì?  ID"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "ì??ì? ì?? ê³ ì?  ID"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "ì?¸ì¦?ì?? ì??ëª? ê°?"
 
@@ -21322,11 +20934,11 @@ msgid "With _Status"
 msgstr "ì??í?? í?¬í?¨(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21356,19 +20968,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "ì? í??(_S)"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "ëª¨ì??"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "%sì?? ë??í?? ë·° ì ?ì??"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "ë·° ì ?ì??"
 
@@ -21381,11 +20988,6 @@ msgstr "\"%s\"ì?? ë??í?? ë·° ì ?ì??"
 msgid "Table"
 msgstr "ë??í??"
 
-# NOTE: ê²?ì?¼ë¡? ë??ì?¤ë?? ë²?ì?ì?´ ì??ë??ë¯?ë¡? ë²?ì?ì?´ ë³?ë¡? ì??ë¯¸ì??ì??.  viewì?? instance.
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "ì?¸ì?¤í?´ì?¤"
-
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "í??ì?¬ ë·° ì ?ì?¥"
@@ -21398,11 +21000,7 @@ msgstr "ì?? ë·° ë§?ë?¤ê¸°(_C)"
 msgid "_Replace existing view"
 msgstr "í??ì?¬ ë·° ë°?ê¾¸ê¸°(_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "í?©í? ë¦¬"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "ì?? ë·° ì ?ì??"
 
@@ -21418,127 +21016,120 @@ msgstr "ë·° ì¢?ë¥?"
 msgid "Type of view:"
 msgstr "ë·° ì¢?ë¥?:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:351
 msgid "De_fault"
 msgstr "ê¸°ë³¸ê°?(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "ê³?ì ? ì?´ë¦?"
-
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:261
 msgid "Protocol"
 msgstr "í??ë¡?í? ì½?"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "ë??ì??"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "GtkRadioAction ë??ì??"
-
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:307
 msgid "Attachment Properties"
 msgstr "ì²¨ë¶? ì??ì?±"
 
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "í??ì?¼ ì?´ë¦?(_F):"
 
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
 msgstr "MIME ì¢?ë¥?:"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:375
+#: ../widgets/misc/e-attachment-store.c:525
 msgid "_Suggest automatic display of attachment"
 msgstr "ì²¨ë¶? í??ì?¼ì?? ì??ë?? í??ì?? ì?°ì? (_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:100
 msgid "Could not set as background"
 msgstr "ë°°ê²½ì?¼ë¡? ì?¤ì ?í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:152
 msgid "Set as _Background"
 msgstr "ë°°ê²½ í??ë©´ì?¼ë¡? ì?¤ì ?(_B)"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:90
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "ì²¨ë¶?ë¥¼ ë³´ë?¼ ì?? ì??ì?µë??ë?¤."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:132
 msgid "_Send To..."
 msgstr "ë³´ë?´ê¸°(_S)..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:134
 msgid "Send the selected attachments somewhere"
 msgstr "ì? í??í?? ì²¨ë¶?ë¥¼ ë?¤ë¥¸ ê³³ì?¼ë¡? ë³´ë??ë??ë?¤"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "ì?½ì?´ë?¤ì?´ë?? ì¤?"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "ì ?ì?¥í??ë?? ì¤?"
 
-#: ../widgets/misc/e-attachment-paned.c:87
+#: ../widgets/misc/e-attachment-paned.c:98
 msgid "Hide Attachment _Bar"
 msgstr "ì²¨ë¶? ëª¨ì?? ì?¨ê¸°ê¸°(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:89
-msgid "Show Attachment _Bar"
-msgstr "ì²¨ë¶? ëª¨ì?? ë³´ê¸°(_B)"
-
+#: ../widgets/misc/e-attachment-paned.c:100
 #: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "ì²¨ë¶? ëª¨ì?? ë³´ê¸°(_A)"
+msgid "Show Attachment _Bar"
+msgstr "ì²¨ë¶? ëª¨ì?? ë³´ì?´ê¸°(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:513
 msgid "Add Attachment"
 msgstr "ì²¨ë¶? ì¶?ê°?"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:516
 msgid "A_ttach"
 msgstr "ì²¨ë¶?(_T)"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:579
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "ì²¨ë¶? ì ?ì?¥"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment-store.c:608
+#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "S_ave All"
 msgstr "ëª¨ë?? ì ?ì?¥(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:377
 msgid "A_dd Attachment..."
 msgstr "ì²¨ë¶?í??ì?¼ ì¶?ê°?(_D)..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:401
 msgid "_Hide"
 msgstr "ì?¨ê¸°ê¸°(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:408
+msgid "Hid_e All"
+msgstr "ëª¨ë?? ì?¨ê¸°ê¸°(_E)"
+
+#: ../widgets/misc/e-attachment-view.c:415
 msgid "_View Inline"
 msgstr "ë?´ë¶?ì??ì?? ë³´ê¸°(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:422
+msgid "Vie_w All Inline"
+msgstr "ëª¨ë?? ë?´ë¶?ì??ì?? ë³´ê¸°(_W)"
+
+#: ../widgets/misc/e-attachment-view.c:739
 #, c-format
 msgid "Open with \"%s\""
 msgstr "\"%s\"ì??ì?? ì?´ê¸°"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:742
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "ì?´ ì²¨ë¶?ë¥¼ \"%s\"ì??ì?? ì?´ê¸°"
@@ -21547,223 +21138,161 @@ msgstr "ì?´ ì²¨ë¶?ë¥¼ \"%s\"ì??ì?? ì?´ê¸°"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "ì²¨ë¶?í?? ë©?ì??ì§?"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
 msgid "A load operation is already in progress"
 msgstr "ì?½ì?´ë?¤ì?´ê¸° ë??ì??ì?´ ì?´ë¯¸ ì§?í?? ì¤?ì??ë??ë?¤"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
 msgid "A save operation is already in progress"
 msgstr "ì ?ì?¥ ë??ì??ì?´ ì?´ë¯¸ ì§?í?? ì¤?ì??ë??ë?¤"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1928
 #, c-format
 msgid "Could not load '%s'"
 msgstr "'%s'ì??(ë¥¼) ì?½ì?´ë?¤ì?¼ ì?? ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1931
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ì²¨ë¶?ë¥¼ ì?½ì?´ë?¤ì?¼ ì?? ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2207
 #, c-format
 msgid "Could not open '%s'"
 msgstr "'%s'ì??(ë¥¼) ì?´ ì?? ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2210
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ì²¨ë¶?ë¥¼ ì?´ ì?? ì??ì?µë??ë?¤."
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2645
 msgid "Attachment contents not loaded"
 msgstr "ì²¨ë¶? ë?´ì?©ì?? ì?½ì?´ë?¤ì?´ì§? ì??ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2721
 #, c-format
 msgid "Could not save '%s'"
 msgstr "'%s'ì??(ë¥¼) ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2724
 #, c-format
 msgid "Could not save the attachment"
 msgstr "ì²¨ë¶?ë¥¼ ì ?ì?¥í?  ì?? ì??ì?µë??ë?¤"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "ë?¤ì?? ë§?í?¬ë¥¼ ì?´ë ¤ë©´ Ctrlê³¼ ë§?ì?°ì?¤ ë?¨ì¶?ë¥¼ ë??ë¥´ì?ì??ì?¤:"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1258
 msgid "%B %Y"
 msgstr "%Yë?? %B"
 
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "ë?¬ë³? ë?¬ë ¥"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "ì±?ì?°ê¸° ì??"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK ì±?ì?°ê¸° ì??"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "ì?¤í?°í?? ì±?ì?°ê¸°"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "ìµ?ì?? ë??ë¹?"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "ìµ?ì?? ë??ë¹?"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "ê³µë°±"
-
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "ë¬¸ì?? ì?¸ì½?ë?©"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "ì?¬ì?©í?  ë¬¸ì??ì?? ì??ë ¥í??ì?ì??ì?¤"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
 msgstr "ê·¸ ì?¸..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:505
 msgid "Date and Time"
 msgstr "ë? ì§? ë°? ì??ê°?"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:526
 msgid "Text entry to input date"
 msgstr "ë? ì§? ì??ë ¥í??ë?? í??ì?¤í?¸ ì??í?¸ë¦¬"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:548
 msgid "Click this button to show a calendar"
 msgstr "ë?¬ë ¥ì?? ë³´ë ¤ë©´ ë?¨ì¶?ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:594
 msgid "Drop-down combination box to select time"
 msgstr "ì??ê°?ì?? ì? í??í??ë?? ë??ë¡ë?¤ì?´ ì½¤ë³´ ì??ì??"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:666
 msgid "No_w"
 msgstr "í??ì?¬(_W)"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:672
 msgid "_Today"
 msgstr "ì?¤ë??(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:680
 msgid "_None"
 msgstr "ì??ì??(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
 msgctxt "date"
 msgid "None"
 msgstr "ì??ì??"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1812
 msgid "Invalid Date Value"
 msgstr "ë? ì§? ê°?ì?´ ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1856
 msgid "Invalid Time Value"
 msgstr "ì??ê°? ê°?ì?´ ì??ëª»ë??ì??ì?µë??ë?¤"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:249
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
 "ì??ë³¼ë£¨ì??ì?¼ë¡? ê°?ì ¸ ì?¬ í??ì?¼ì?? ì? í??í??ì??ê³ , ê·¸ í??ì?¼ì?? ì¢?ë¥?ë¥¼ ëª©ë¡?ì??ì?? ê³ ë¥´ì?ì??ì?¤."
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "í??ì?¼ ì?´ë¦?(_I):"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "í??ì?¼ì?? ê³ ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "í??ì?¼ ì¢?ë¥?(_T):"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:916
 msgid "Choose the destination for this import"
 msgstr "ì?´ë??ë¡? ê°?ì ¸ì?¬ ì§?ë¥¼ ê³ ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "ì?¤í??í?  ê°?ì ¸ì?¤ê¸° ì¢?ë¥?ë¥¼ ì? í??í??ì?ì??ì?¤:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "ê³¼ê±°ì?? ì?°ë?? í??ë¡?ê·¸ë?¨ì??ì?? ë?°ì?´í?° ë°? ì?¤ì ? ì?¬í? ê°?ì ¸ì?¤ê¸°(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "í??ì?¼ í?? ê°? ê°?ì ¸ì?¤ê¸°(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "ëª©ë¡?ì??ì?? ê°?ì ¸ì?¬ í??ì?¼ì?? ì¢?ë¥?ë¥¼ ì? í??í?©ë??ë?¤."
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:526
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21773,17 +21302,39 @@ msgstr ""
 "ì¼?ì?´í??, ELM, iCalendar. ê°?ì ¸ì?¬ ì?? ì??ë?? ì?¤ì ?ì?? ì°¾ì?? ì?? ì??ì??ì?µë??ë?¤. ë?¤ì?? ì??ë??í??"
 "ë ¤ë©´ \"ë?¤ë¡?\" ë?¨ì¶?ë¥¼ ë??ë¥´ì?ì??ì?¤."
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:773
+msgid "_Cancel Import"
+msgstr "ê°?ì ¸ì?¤ê¸° ì·¨ì??(_C)"
+
+# tooltip
+#: ../widgets/misc/e-import-assistant.c:915
+msgid "Preview data to be imported"
+msgstr "ê°?ì ¸ì?¬ ë?°ì?´í?°ë¥¼ ë¯¸ë¦¬ ë´?ë??ë?¤"
+
+#: ../widgets/misc/e-import-assistant.c:921
+#: ../widgets/misc/e-import-assistant.c:934
+#: ../widgets/misc/e-import-assistant.c:1284
+#: ../widgets/misc/e-import-assistant.c:1350
+#: ../widgets/misc/e-import-assistant.c:1359
+msgid "Import Data"
+msgstr "ì¤?ì?? ë?°ì?´í?°"
+
+#: ../widgets/misc/e-import-assistant.c:929
+msgid "Select what type of file you want to import from the list."
+msgstr "ëª©ë¡?ì??ì?? ê°?ì ¸ì?¬ í??ì?¼ì?? ì¢?ë¥?ë¥¼ ì? í??í?©ë??ë?¤."
+
+#: ../widgets/misc/e-import-assistant.c:1274
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Evolution Import Assistant"
 msgstr "ì??ë³¼ë£¨ì?? ê°?ì ¸ì?¤ê¸° ë??ì?°ë¯¸"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1338
 msgid "Import Location"
 msgstr "ì??ì¹? ê°?ì ¸ì?¤ê¸°"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1302
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21793,32 +21344,27 @@ msgstr ""
 "ì?´ ë??ì?°ë¯¸ì?? ì??ë?´ì?? ë?°ë?¼ ì?¸ë¶?ì?? í??ì?¼ë?¤ì?? ì??ë³¼ë£¨ì??ì?¼ë¡? ê°?ì ¸ì?¤ë?? ë?¨ê³? ë?¨ê³?ë¥¼ ë?°"
 "ë¥´ì?ì??ì?¤."
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Importer Type"
 msgstr "ê°?ì ¸ì?¤ê¸° ì¢?ë¥?"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1324
 msgid "Select Information to Import"
 msgstr "ê°?ì ¸ì?¬ ì ?ë³´ë¥¼ ì? í??í??ì?ì??ì?¤"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1331
 msgid "Select a File"
 msgstr "í??ì?¼ì?? ê³ ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "ì??ë³¼ë£¨ì??ì?¼ë¡? í??ì?¼ì?? ê°?ì ¸ì?¤ë ¤ë©´ \"ì ?ì?©\"ì?? ë??ë¥´ì?ì??ì?¤."
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "ì¤?ì?? ë?°ì?´í?°"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:557
 msgid "World Map"
 msgstr "ì?¸ê³? ì§?ë??"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:559
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21842,126 +21388,56 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "ì??ë³¼ë£¨ì??ì?? í??ì?¬ ì?°ê²° ì¤?ì§? ì??í??ì??ë??ë?¤. ë?¤í?¸ì??í?¬ë¥¼ ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "ë?¨ì¶? ì??í??ê°? ì?°ê²° ì??í??ì??ë??ë?¤"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "ê°?ë¡? ì??ì¹?"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "ê°?ë¡? ë°©í?¥ì?¼ ë?? ì°½ ì??ì¹?"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "ì?¸ë¡? ì??ì¹?"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "ì?¸ë¡? ë°©í?¥ì?¼ ë?? ì°½ ì??ì¹?"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "ë¹?ì?¨"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "ë³´ì¡° ì°½ í?¬ê¸°ì?? ë¹?ì?¨"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "í?¬ê¸° ì¡°ì ? ê³ ì ?"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "í?¬ê¸° ì¡°ì ?í?  ë?? ë³´ì¡° ì°½ ê³ ì ?í??ê¸°"
-
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "ë?¤ì??ì?? ë??ê¸°í??:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "ê°?ì?¸ ì ?ë³´ ë??ê¸°í??:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "ë??ê¸°í?? ë¶?ë¥?:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:278
 msgid "Evolution Preferences"
 msgstr "ì??ë³¼ë£¨ì?? ê¸°ë³¸ ì?¤ì ?"
 
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "ì?¼ì¹?: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:557
 msgid "Close the find bar"
 msgstr "ì?´ ì°¾ê¸° ëª¨ì??ì?? ë?«ì?µë??ë?¤"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "ì°¾ê¸°(_D):"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Clear the search"
 msgstr "ê²?ì?? ê²°ê³¼ ì§?ì?°ê¸°"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:600
 msgid "_Previous"
 msgstr "ì?´ì ?(_P)"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "Find the previous occurrence of the phrase"
 msgstr "ì?´ì ?ì?? ì??ë?? í?´ë?¹ ë¬¸êµ¬ë¥¼ ì°¾ì?µë??ë?¤"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Next"
 msgstr "ë?¤ì??(_N)"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:622
 msgid "Find the next occurrence of the phrase"
 msgstr "ë?¤ì??ì?? ì??ë?? í?´ë?¹ ë¬¸êµ¬ë¥¼ ì°¾ì?µë??ë?¤"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Mat_ch case"
 msgstr "ë??ì??ë¬¸ì?? êµ¬ë³?(_C)"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:660
 msgid "Reached bottom of page, continued from top"
 msgstr "í??ì?´ì§? ë§¨ ì??ë??ì?? ë??ì°©í??ì?µë??ë?¤. ë§¨ ì??ë¶?í?° ê³?ì??í?©ë??ë?¤"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:682
 msgid "Reached top of page, continued from bottom"
 msgstr "í??ì?´ì§? ë§¨ ì??ì?? ë??ì°©í??ì?µë??ë?¤. ë§¨ ì??ë??ë¶?í?° ê³?ì??í?©ë??ë?¤"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "ì»¤ì?? í??"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "ì»¤ì?? ì?´"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "ì ?ë ¬"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "ì? í?? ëª¨ë??"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "ì»¤ì?? ëª¨ë??"
-
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:516
 msgid "When de_leted:"
 msgstr "ì§?ì?¸ ë??(_L):"
 
@@ -21981,96 +21457,111 @@ msgstr "ë°°ë?¬ë?¨ ë°? ì?´ë¦¼(_V)"
 msgid "Delivery Options"
 msgstr "ë°°ë?¬ ì?µì??"
 
-# FIXME: ì?´ê±° ë²?ì?í?´ì?¼ ë?¼? ì»¤ì?¤í?? í?¤ë??ì?? ì?°ë?? ê°?ì?? ì??ì ?.
 #: ../widgets/misc/e-send-options.ui.h:6
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "ê¸°í??(_U):"
+
+# FIXME: bad msgid
+#: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "ë?¤ì?? ë?¤ì??(_A):"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "ì?¼"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "ë?¤ì?? ê¸°í?? ì??ì??(_T):"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "ì?¼"
+
+# FIXME: ì?´ê±° ë²?ì?í?´ì?¼ ë?¼? ì»¤ì?¤í?? í?¤ë??ì?? ì?°ë?? ê°?ì?? ì??ì ?.
+#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "í?¼ì??ì??ë§? ë³´ê¸°"
 
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "ì?¼ë°? ì?µì??(_R)"
 
 # read receipt -> ë?´ì?© ì?½ì?? í??ì?¸, Microsoft Office XP ì°¸ê³ 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
 msgstr "ë©?ì?¼ ë?´ì?© ì?½ì?? í??ì?¸"
 
 # FIXME: ì?´ê±° ë²?ì?í?´ì?¼ ë?¼? ì»¤ì?¤í?? í?¤ë??ì?? ì?°ë?? ê°?ì?? ì??ì ?.
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr "ë¬´ë?¨ ì ?ì ? ê¸?ì§?"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
-msgstr "ë?µì?¥ ì??ì²(_E)"
+msgstr "í??ì?  ì??ì²(_E)"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "ë°?ì?¡ ë©?ì?¼ ì??ë¦¼"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "ì??í?? ì¶?ì ?(_T)"
 
 # FIXME: ì?´ê±° ë²?ì?í?´ì?¼ ë?¼? ì»¤ì?¤í?? í?¤ë??ì?? ì?°ë?? ê°?ì?? ì??ì ?.
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
 msgstr "í??ì¤?"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "ì??í?? ì¶?ì ?"
 
 # FIXME: ì?´ê±° ë²?ì?í?´ì?¼ ë?¼? ì»¤ì?¤í?? í?¤ë??ì?? ì?°ë?? ê°?ì?? ì??ì ?.
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "ì?¼ê¸?ë¹?ë°?"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "ë°?ì??ë?¤ì?¬ì§?ë©´(_P):"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "ì??ì?±ë??ë©´(_M):"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "ê±°ë¶?ë?¹í??ë©´(_N):"
 
-#: ../widgets/misc/e-send-options.ui.h:28
-msgid "Wi_thin"
-msgstr "ë?¤ì?? ê¸°í?? ì??ì??(_T):"
-
-# FIXME: bad msgid
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "ë?¤ì?? ë?¤ì??(_A):"
-
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_All information"
 msgstr "ëª¨ë?  ì ?ë³´(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "ë¶?ë¥?(_C):"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "ë©?ì??ì§? ë°°ë?¬ ì§?ì?°(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "ë°°ë?¬ë?¨(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "ë§?ë£? ë? ì§? ì?¤ì ?(_S)"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "ê¸°í??(_U):"
-
 #: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "í?¸ë¦¬í?? ë??ì??(_W)"
@@ -22079,38 +21570,44 @@ msgstr "í?¸ë¦¬í?? ë??ì??(_W)"
 msgid "_When opened:"
 msgstr "ì?´ë©´(_W):"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "ì??ì??"
+
+#: ../widgets/misc/e-signature-editor.c:136
+#: ../widgets/misc/e-signature-editor.c:524
+#: ../widgets/misc/e-signature-manager.c:353
+#: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
 msgstr "ì?´ë¦?ì??ì??"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:213
 msgid "_Save and Close"
 msgstr "ì ?ì?¥ í?? ë?«ê¸°(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:391
 msgid "Edit Signature"
 msgstr "ì??ëª? í?¸ì§?"
 
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:406
 msgid "_Signature Name:"
 msgstr "ì??ëª? ì?´ë¦?(_S):"
 
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:298
 msgid "Add Signature Script"
 msgstr "ì??ëª? ì?¤í?¬ë¦½í?¸ ì¶?ê°?"
 
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:363
 msgid "Edit Signature Script"
 msgstr "ì??ëª? ì?¤í?¬ë¦½í?¸ í?¸ì§?"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:579
 msgid "Add _Script"
 msgstr "ì?¤í?¬ë¦½í?¸ ì¶?ê°?(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:270
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -22119,53 +21616,53 @@ msgstr ""
 "ë?¤ì?? ì?¤í?¬ë¦½í?¸ì?? ì¶?ë ¥ì?? ì??ëª?ì?¼ë¡? ì?¬ì?©í?©ë??ë?¤.\n"
 "ì§?ì ?í??ë?? ì?´ë¦?ì?? í??ì?? ëª©ì ?ì?¼ë¡?ë§? ì?´ì?©í?©ë??ë?¤."
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:315
 msgid "S_cript:"
 msgstr "ì?¤í?¬ë¦½í?¸(_C):"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:346
 msgid "Script file must be executable."
 msgstr "ì?¤í?¬ë¦½í?¸ í??ì?¼ì?? ì?¤í??í?  ì?? ì??ì?´ì?¼ í?©ë??ë?¤."
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "URLë¡? ê°?ë ¤ë©´ ì?¬ê¸°ë¥¼ ë??ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:374
 msgid "_Copy Link Location"
 msgstr "ë§?í?¬ ì??ì¹? ë³µì?¬(_C)"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:376
 msgid "Copy the link to the clipboard"
 msgstr "ë§?í?¬ë¥¼ í?´ë¦½ë³´ë??ë¡? ë³µì?¬í?©ë??ë?¤"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:384
 msgid "_Open Link in Browser"
 msgstr "ë¸?ë?¼ì?°ì ?ì??ì?? ë§?í?¬ ì?´ê¸°(_O)"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:386
 msgid "Open the link in a web browser"
 msgstr "ì?¹ ë¸?ë?¼ì?°ì ?ì??ì?? ë§?í?¬ ì?´ê¸°"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:394
 msgid "_Copy Email Address"
 msgstr "ì ?ì??ë©?ì?¼ ì£¼ì?? ë³µì?¬(_C)"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
 msgid "Select all text and images"
 msgstr "ëª¨ë?  í??ì?¤í?¸ì?? ê·¸ë¦¼ì?? ì? í??í?©ë??ë?¤"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
+#: ../widgets/misc/e-web-view.c:859
 #, c-format
 msgid "Click to call %s"
 msgstr "%sì??ê²? í?¸ì¶?í??ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:861
 msgid "Click to hide/unhide addresses"
 msgstr "ì£¼ì??ë¥¼ ê°?ì¶?ë ¤ë©´/ë³´ì?´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:863
 #, c-format
 msgid "Click to open %s"
 msgstr "%s URLì?? ì?´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
@@ -22173,7 +21670,7 @@ msgstr "%s URLì?? ì?´ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 #: ../widgets/misc/ea-calendar-item.c:299
 #: ../widgets/misc/ea-calendar-item.c:308
 msgid "%d %B %Y"
-msgstr "%Yë?? %B %eì?¼"
+msgstr "%Yë?? %B %dì?¼"
 
 #: ../widgets/misc/ea-calendar-item.c:311
 #, c-format
@@ -22184,7 +21681,7 @@ msgstr "ë?¬ë ¥: %sì??ì?? %sê¹?ì§?"
 msgid "evolution calendar item"
 msgstr "ì??ë³¼ë£¨ì?? ë?¬ë ¥ í?ëª©"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "í??ì?? ëª©ë¡?"
 
@@ -22202,7 +21699,7 @@ msgstr "ì??ì??"
 msgid "OK"
 msgstr "í??ì?¸"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "ì??ê°?ì?? ë?¤ì??ê³¼ ê°?ì?? í??ì??ì?´ì?´ì?¼ í?©ë??ë?¤: %s"
@@ -22211,48 +21708,12 @@ msgstr "ì??ê°?ì?? ë?¤ì??ê³¼ ê°?ì?? í??ì??ì?´ì?´ì?¼ í?©ë??ë?¤: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "í?¼ì?¼í?¸ ê°?ì?? 0ê³¼ 100ì?? í?¬í?¨í??ì?¬ ê·¸ ì?¬ì?´ì?´ì?¼ í?©ë??ë?¤."
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "ì? í??í?? ì?´"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "í?¬ì»¤ì?¤í?? ì?´"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "ì? í?? í?´ì ?í?? ì?´"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "ì·¨ì??ì?  ì?´"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "ë°?ì¤? ì?´"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "êµµì?? ê¸?ì?? ì?´"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "ì??ê¹? ì??ë?? ì?´"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "ë°°ê²½ì?? ì?´"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "ì¶?ê°?í??ë ¤ë©´ ë??ë¥´ì?ì??ì?¤"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "ì??í??"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(ì¦?ê°?)"
@@ -22269,12 +21730,12 @@ msgstr "ì ?ë ¬ ì?? í?¨"
 msgid "No grouping"
 msgstr "ë¬¶ì§? ì??ì??"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "í??ë?? í??ì??"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "ì?¬ì?© ê°?ë?¥í?? í??ë??"
 
@@ -22283,7 +21744,7 @@ msgid "A_vailable Fields:"
 msgstr "ì?¬ì?© ê°?ë?¥í?? í??ë??(_V):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "ì¦?ê°?"
 
@@ -22296,7 +21757,7 @@ msgid "Clear _All"
 msgstr "ëª¨ë?? ì§?ì?°ê¸°(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "ê°?ì??"
 
@@ -22356,7 +21817,7 @@ msgstr "ë?¤ì?? í??ë??ë¥¼ ì??ì??ë??ë¡? í??ì??(_S):"
 msgid "_Sort..."
 msgstr "ì ?ë ¬(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "ì?´ ì¶?ê°?"
 
@@ -22368,245 +21829,110 @@ msgstr ""
 "í??ì?? ì?´ì?? ì¶?ê°?í??ë ¤ë©´, ì?´ì?? í??ì??í? \n"
 "ì??ì¹?ì?? ì?´ì?? ë??ì?´ ë??ì?¼ì?ì??ì?¤."
 
-#: ../widgets/table/e-table-group-container.c:342
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
 #, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%dê°? í?ëª©)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%dê°? í?ëª©)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "í??ì?? ì?? êµ?ì°¨"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "ê°?ë¡? ê²©ì?? ê·¸ë¦¬ê¸°"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "ì?¸ë¡? ê²©ì?? ê·¸ë¦¬ê¸°"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "í?¬ì»¤ì?¤ ê·¸ë¦¬ê¸°"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "ì»¤ì?? ëª¨ë??"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "ì? í?? ëª¨ë?¸"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "ê¸¸ì?´ í??ê³?ì¹?"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "í?? ë??ì?´ í?µì?¼"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "ê³ ì ?"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "í??ì?¬ ë·° ì?¬ì?©ì?? ì?¤ì ?í??ê¸°"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "ì?¤ë¦?ì°¨ì?? ì ?ë ¬ (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "ë?´ë¦¼ì°¨ì?? ì ?ë ¬(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "ì ?ë ¬ ì??í?¨(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "ì?´ ë²?ì??ë¡? ë¬¶ì??(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "ì??ì??ë¡? ë¬¶ì??(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "ì?´ ì ?ê±°(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "ì?´ ì¶?ê°?(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "ì ?ë ¬(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "ì??ë?? ë§?ì¶¤(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "ì?´ í??ì??(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "í??ì?¬ ë³´ê¸° ì?¬ì?©ì?? ì?¤ì ?(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "ì ?ë ¬ ê¸°ì¤?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "ì?¬ì?©ì?? ì?¤ì ?(_C)"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "í??ì?´ë¸? í?¤ë??"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "í??ì?´ë¸? ëª¨ë?¸"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "ì»¤ì?? í??"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "ì ?ë ¬ ì ?ë³´"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "ì?¸ì ?ë?? ê²?ì??"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "ì¶?ê°?í??ë ¤ë©´ ë??ë¥´ê¸° ì?¬ì?©"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "í?? ì?¸ë¡? ì?¬ë°±"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "í?? ì?¬ì?´ì?? ì?¸ë¡? ë°©í?¥ ì?¬ë°±. í??ì?? ì??ì?? ì??ë??ì?? ì¶?ê°?ë?©ë??ë?¤."
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree í??ì?´ë¸? ì?´ë??í?°"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "ë¦¬í?¸ë¡? ëª¨ì??"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "ì? ê³¼ +/- í??ì?¥ ë?¨ì¶?ë¥¼ ê·¸ë¦½ë??ë?¤."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "í??ì?¥ ë?¨ì¶? í?¬ê¸°"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "í??ì?¥ í??ì?´í??ì?? í?¬ê¸°"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "í??ì??"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "í??ì?? ì°½ í??ì??"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "í?¸ì§?"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "ì?´ ì?? í?¸ì§? ì??ì??"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "í? ê¸?"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "ì?? í? ê¸?"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "ë??ë¦¬ê¸°"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "ì?´ ì??ì?´ ë?¤ì?´ ì??ë?? ETreeì?? í?? ë??ë¦¬ê¸°"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "ì¤?ì?´ê¸°"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ì?´ ì??ì?´ ë?¤ì?´ ì??ë?? ETreeì?? í?? ì¤?ì?´ê¸°"
 
@@ -22622,115 +21948,19 @@ msgstr "ë??ë¥´ê¸°"
 msgid "sort"
 msgstr "ì ?ë ¬"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2536
 msgid "Select All"
 msgstr "ëª¨ë?? ì? í??"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2548
 msgid "Input Methods"
 msgstr "ì??ë ¥ê¸°"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "í??ì?¬ ì²?ë¦¬"
-
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "í??ì?¤í?¸"
-
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "êµµì?? ê¸?ì?¨"
-
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "ì·¨ì??ì? "
-
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "ì?°ê²°"
-
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "ë§?ì¶¤"
-
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "ì??ë¥´ê¸° ë??ë¹?"
-
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "ì??ë¥´ê¸° ë??ì?´"
-
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "ì??ë¥´ê¸°"
-
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "ì??ë¥´ê¸° ì?¬ê°?í??"
-
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "ê°?ë¡? ì?¤í??ì??"
-
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "ì?¸ë¡? ì?¤í??ì??"
-
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "í??ì?¤í?¸ ë??ë¹?"
-
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "í??ì?¤í?¸ ë??ì?´"
-
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "ë§?ì¤?ì??í?? ì?¬ì?©"
-
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "ë§?ì¤?ì??í??"
-
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "ì¤? ë°?ê¿?"
-
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "ë??ê¹? ë¬¸ì??"
-
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "ìµ?ë?? ì¤? ì??"
-
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "í??ë??ë¦¬ ê·¸ë¦¬ê¸°"
-
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "ì¤?ë°?ê¿? í??ì?©"
-
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "ë°°ê²½ ê·¸ë¦¬ê¸°"
-
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "ë?¨ì¶? ê·¸ë¦¬ê¸°"
+#~ msgid "Blink icon in notification area."
+#~ msgstr "ì??ë¦¼ ì??ì?ì??ì?? ì??ì?´ì½? ê¹?ë°?ì?´ê¸°."
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "ì»¤ì?? ì??ì¹?"
+#~ msgid "Whether the icon should blink or not."
+#~ msgstr "ì??ì?´ì½?ì?? ê¹?ë°?ì?¼ì§? ì?¬ë¶?."
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "ì??ë ¥ê¸° ì»¨í??ì?¤í?¸"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "í??ì?? ì²?ë¦¬"
+#~ msgid "B_link icon in notification area"
+#~ msgstr "ì??ë¦¼ ì??ì?ì??ì?? ì??ì?´ì½? ê¹?ë°?ì?´ê¸°(_L)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]