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

From: Chao-Hsiung Liao <chliao src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Thu, 21 Jan 2010 13:12:21 +0000 (UTC)
commit 09bd7ec1d9ab4005e7d390496a61800cd04d8c91
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu Jan 21 21:11:53 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |20560 ++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po |20932 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 20154 insertions(+), 21338 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index b554192..5bfd903 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -3,341 +3,34 @@
 # Joe Man <trmetal yahoo com hk>, 2001.
 # Chao-Hsiung Liao <pesder liao msa hinet net>, 2003.
 # Craig Jeffares <cjeffares novell com>,2004.
-# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005.
+# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010.
 # Abel Cheung <abelcheung gmail com>, 2006.
-#
+#: ../shell/main.c:511
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.27.4\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2009-09-18 12:14+0000\n"
-"PO-Revision-Date: 2009-09-19 21:06+0800\n"
+"Project-Id-Version: evolution 2.29.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-21 21:07+0800\n"
+"PO-Revision-Date: 2010-01-21 21:10+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution address book"
-msgstr "evolution é??è¨?é??"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:208
-msgid "New Contact"
-msgstr "æ?°å¢?è?¯çµ¡äºº"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:216
-msgid "New Contact List"
-msgstr "æ?°å¢?è?¯çµ¡äººæ¸?å?®"
-
-#: ../a11y/addressbook/ea-minicard-view.c:161
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "ç?®å??ç??é??è¨?é??è³?æ??å¤¾ %s æ?? %d å¼µå?¡ç??"
-msgstr[1] "ç?®å??ç??é??è¨?é??è³?æ??å¤¾ %s æ?? %d å¼µå?¡ç??"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "é??å??"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "è?¯çµ¡äººæ¸?å?®: "
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "è?¯çµ¡äºº: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "Evolution è¿·ä½ å?¡ç??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:263
-msgid "It has alarms."
-msgstr "å®?å?·æ??é¬§é?´ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:266
-msgid "It has recurrences."
-msgstr "å®?æ?¯é?±æ??æ?§ç´?æ??ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:269
-msgid "It is a meeting."
-msgstr "é??æ?¯ä¸?é ?æ??è°ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:275
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ??è¦?ç?º %sã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-msgid "Calendar Event: It has no summary."
-msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ²?æ??æ??è¦?ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:297
-msgid "calendar view event"
-msgstr "è¡?äº?æ??æª¢è¦?äº?ä»¶"
-
-#: ../a11y/calendar/ea-cal-view-event.c:525
-msgid "Grab Focus"
-msgstr "å¾?å?°ç?¦é»?"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "æ?°å¢?ç´?æ??"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "æ?°å¢?å?¨å¤©äº?ä»¶"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "æ?°å¢?æ??è°"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "ç§»è?³ä»?æ?¥"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "ç§»è?³æ?¥æ??"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:300
-#: ../a11y/calendar/ea-week-view-main-item.c:297
-msgid "a table to view and select the current time range"
-msgstr "ç?¨ä¾?æª¢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??è¡¨æ ¼"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148
-#: ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "å®?æ?? %d å??äº?ä»¶ã??"
-msgstr[1] "å®?æ?? %d å??äº?ä»¶ã??"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152
-#: ../a11y/calendar/ea-week-view.c:149
-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."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-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."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "æ?¥æª¢è¦?ï¼?%sã??%s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "å·¥ä½?é?±ç??è¡?äº?æ??æª¢è¦?"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "ç?¨æ?¼ä¸?æ??å¤?æ?¥ç??è¡?äº?æ??æª¢è¦?"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:771
-msgid "%A %d %b %Y"
-msgstr "%Y/%m/%d (%a)"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/e-day-view-top-item.c:844
-#: ../calendar/gui/e-day-view.c:1593
-#: ../calendar/gui/e-week-view-main-item.c:368
-msgid "%a %d %b"
-msgstr "%-m æ?? %-d æ?¥ (%a)"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:783
-msgid "%a %d %b %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:802
-#: ../calendar/gui/calendar-component.c:808
-#: ../calendar/gui/calendar-component.c:810
-msgid "%d %b %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:800
-#: ../calendar/gui/e-day-view-top-item.c:848
-#: ../calendar/gui/e-day-view.c:1609
-#: ../calendar/gui/e-week-view-main-item.c:382
-msgid "%d %b"
-msgstr "%-m æ?? %-d æ?¥"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:782
-msgid "Gnome Calendar"
-msgstr "Gnome è¡?äº?æ??"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "æ??å°?å??"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "evolution è¡?äº?æ??æ??å°?å??"
-
-#: ../a11y/calendar/ea-jump-button.c:146
-msgid "Jump button"
-msgstr "è·³èº?æ??é??"
-
-#: ../a11y/calendar/ea-jump-button.c:155
-msgid "Click here, you can find more events."
-msgstr "æ??é??è£?ï¼?ä½ å?¯ä»¥æ?¾å?°æ?´å¤?äº?ä»¶ã??"
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "æ??æª¢è¦?ï¼?%sã??%s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "é?±æª¢è¦?ï¼?%sã??%s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??æª¢è¦?"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??æª¢è¦?"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "å½?å?º"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "å½?å?ºå?é?¸å?®"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "ç·¨è¼¯"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
-msgid "begin editing this cell"
-msgstr "é??å§?ç·¨è¼¯æ¤å?²å?æ ¼"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "å??æ??"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
-msgid "toggle the cell"
-msgstr "å??æ??å?²å?æ ¼"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "å±?é??"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
-msgid "expands the row in the ETree containing this cell"
-msgstr "å±?é?? ETree ä¸å??å?«æ¤å?²å?æ ¼ç??å??"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "æ?¶æ?º"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
-msgid "collapses the row in the ETree containing this cell"
-msgstr "æ??ç?? ETree ä¸å??å?«æ¤å?²å?æ ¼ç??å??"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:120
-msgid "Table Cell"
-msgstr "è¡¨æ ¼ç??å?²å?æ ¼"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
-#: ../widgets/table/e-table-click-to-add.c:578
-msgid "click to add"
-msgstr "è«?æ??é??è£?å? å?¥"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
-msgid "click"
-msgstr "é»?é?¸"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "æ??åº?"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "è¡?äº?æ??ï¼?å¾? %s å?° %s"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "evolution è¡?äº?æ??é ?ç?®"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "çµ?å??æ??é??"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "ä½¿ç?¨é ?è¨å?¼"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "å½?å?ºå¼?é?¸å?®"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??é??è¨?é??ã??è«?å¾?é??è¨?é??æª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
 msgstr "æ¤è?¯çµ¡äººç??é?»å?é?µä»¶å?°å??å·²ç¶?å?å?¨ã??ä½ ç?¡è«?å¦?ä½?é?½è¦?å? å?¥å??æ¨£ä½?å??ç??æ?°å?¡ç??å??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:4
@@ -357,7 +50,10 @@ msgid "Category editor not available."
 msgstr "å??é¡?ç·¨è¼¯å?¨ç?¡æ³?ä½¿ç?¨ã??"
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
 msgstr "è«?æª¢æ?¥ä¾?ç¢ºå®?ä½ ç??å¯?ç¢¼æ?¼æ³?æ£ç¢ºï¼?è??ä¸?ä½ ä½¿ç?¨ç??æ?¯æ?¯æ?´ç??ç?»å?¥æ?¹æ³?ã??è«?è¨?å¾?è¨±å¤?å¯?ç¢¼æ??å??å??å¤§å°?å¯«ï¼?ä½ å?¯è?½å??å??äº?å¤§å¯«é??å®?é?µã??"
 
 #: ../addressbook/addressbook.error.xml.h:9
@@ -369,7 +65,10 @@ msgid "Could not remove address book."
 msgstr "ç?¡æ³?ç§»é?¤é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgid ""
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr "ç?®å??ä½ å?ªè?½å?å?? Evolution ä¸ç?? GroupWise ç³»çµ±é??è¨?é??ã??è«?ä½¿ç?¨ä¸?æ¬¡å?¶ä»?ç?? GroupWise é?µä»¶å®¢æ?¶ç«¯ï¼?ä»¥å??å¾?ä½ ç?? GroupWise å¸¸ç?¨è?¯çµ¡äººå?? Groupwise å??äººè?¯çµ¡äººè³?æ??å¤¾ã??"
 
 #: ../addressbook/addressbook.error.xml.h:12
@@ -377,1090 +76,519 @@ msgid "Delete address book '{0}'?"
 msgstr "å?ªé?¤é??è¨?é??ã??{0}ã??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "è¼?å?¥é??è¨?é??ç?¼ç??é?¯èª¤ã??"
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "å°? {0} å?²å?è?³ {1} ç?¼ç??é?¯èª¤ï¼? {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "ç?¡æ³?é©?è? LDAP ä¼ºæ??å?¨ã??"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
 msgid "Failed to delete contact"
 msgstr "å?ªé?¤è?¯çµ¡äººå¤±æ??"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise é??è¨?é??ç??å»ºç«?"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP ä¼ºæ??å?¨æ?ªå??æ??æ??æ??ç??ç¶±è¦?è³?è¨?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
-msgid "Server Version"
-msgstr "ä¼ºæ??å?¨ç??æ?¬"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨ä½ ç?®å??ç??ä¼ºæ??å?¨ç??æ?¬ä¸?æ£å¸¸é??ä½?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution é??è¨?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The image you have selected is large. Do you want to resize and store it?"
+#: ../addressbook/addressbook.error.xml.h:20
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr "ä½ æ??é?¸æ??ç??å??ç??å¤ªå¤§ã??ä½ æ?¯å?¦è¦?æ?¹è®?å¤§å°?å¾?æ??å?²å?å®?ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:23
-msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
 msgstr "æ¤ LDAP ä¼ºæ??å?¨å?¯è?½ä½¿ç?¨è??ç?? LDAP ç??æ?¬ï¼?å®?ä¸?æ?¯æ?´æ¤å??è?½ï¼?æ??å?¯è?½è¨å®?é?¯èª¤ã??è«?æ´½è©¢ç®¡ç??å?¡ï¼?ç?è§£æ?¯æ?´ç??æ??å°?å?ºç¤?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "ç?¡æ³?é??å??æ¤é??è¨?é??ã??"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book server does not have any suggested search bases."
 msgstr "æ¤é??è¨?é??ä¼ºæ??å?¨æ²?æ??ä»»ä½?å»ºè°ç??æ??å°?å?ºç¤?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr "æ¤é??è¨?é??ä¼ºæ??å?¨ç?¡æ³?é?£ç·?ï¼?æ??ä¼ºæ??å?¨å??ç¨±å?¯è?½æ?¼é?¯ï¼?æ??ä½ ç??ç¶²çµ¡é?£ç·?å·²ç¶?å??æ¢ã??"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "æ¤é??è¨?é??å°?è¢«æ°¸é? ç§»é?¤ã??"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "æ¤ä¼ºæ??å?¨ä¸?æ?¯æ?´ LDAPv3 ç¶±è¦?è³?è¨?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "ç?¡æ³?é??å??é??è¨?é??"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "ç?¡æ³?å?·è¡?æ??å°?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "ç?¡æ³?å?²å? {0}ã??"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "è¦?å?²å?æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:33
-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?"
+#: ../addressbook/addressbook.error.xml.h:31
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
 msgstr "ä½ æ£å?¨å??è©¦å¾?æ??ä¸?å??é??è¨?é??ï¼?å°?è?¯çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??ï¼?ä½?æ?¯å®?ç?¡æ³?å¾?ä¾?æº?ç§»é?¤ã??ä½ æ?³è¦?å?²å?ä¸?å??å?¯æ?¬ä¾?ä»£æ?¿å??ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:34
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
+#: ../addressbook/addressbook.error.xml.h:32
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
 msgstr "ä½ æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??å¤ª"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ä½ æ²?æ??è¶³å¤ ç??æ¬?é??å?ªé?¤é??å??é??è¨?é??ä¸ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/addressbook.error.xml.h:36
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+#: ../addressbook/addressbook.error.xml.h:34
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr "ä½ å·²ç¶?ä¿®æ?¹æ¤è?¯çµ¡äººã??è¦?å?²å?é??äº?æ?´æ?¹ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:35
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨ {0} ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/addressbook.error.xml.h:38
-#: ../mail/em-vfolder-rule.c:513
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../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:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "æ?¾æ£?(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "ä¸?è¦?å?²å?(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "èª¿æ?´å¤§å°?(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 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:44
-#: ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:143
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:590
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "é ?è¨ç??å??æ¥å?°å??:"
 
-#: ../addressbook/conduit/address-conduit.c:1613
-#: ../addressbook/conduit/address-conduit.c:1614
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "ç?¡æ³?è¼?å?¥é??è¨?é??"
 
-#: ../addressbook/conduit/address-conduit.c:1691
-#: ../addressbook/conduit/address-conduit.c:1694
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "ç?¡æ³?è®?å?? pilot é??è¨?é??ç¨?å¼?å??å¡?"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "C_ontacts"
-msgstr "è?¯çµ¡äºº(_O)"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "è?æ?¸"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure contacts and autocompletion here"
-msgstr "å?¨æ¤è¨å®?è?¯çµ¡äººè??è?ªå??å®?æ??"
-
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:193
-#: ../calendar/gui/migration.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:579
-msgid "Contacts"
-msgstr "è?¯çµ¡äºº"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Address Book"
-msgstr "Evolution é??è¨?é??"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book address popup"
-msgstr "Evolution é??è¨?é??ä½?å??å½?å?ºå¼?é ?ç?®"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address viewer"
-msgstr "Evolution é??è¨?é??å?°å??æª¢è¦?å?¨"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book card viewer"
-msgstr "Evolution é??è¨?é??å?¡ç??æª¢è¦?å?¨"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book component"
-msgstr "Evolution é??è¨?é??å??ä»¶"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution S/MIME Certificate Management Control"
-msgstr "Evolution S/MIME è?æ?¸ç®¡ç??æ?§å?¶"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution è³?æ??å¤¾è¨å®?çµ?æ??æ?§å?¶"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Manage your S/MIME certificates here"
-msgstr "å?¨æ¤ç®¡ç??ä½ ç?? S/MIME è?æ?¸"
-
-#. create the local source group
-#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:97
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:192
-#: ../calendar/gui/memos-component.c:151
-#: ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:576
-#: ../calendar/gui/migration.c:1090
-#: ../calendar/gui/tasks-component.c:148
-#: ../mail/em-folder-tree-model.c:191
-#: ../mail/em-folder-tree-model.c:193
-#: ../mail/em-migrate.c:2890
-#: ../mail/mail-component.c:320
-#: ../mail/mail-vfolder.c:217
-#: ../mail/message-list.c:1515
-msgid "On This Computer"
-msgstr "æ??ç??é?»è?¦"
-
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:98
-#: ../addressbook/gui/component/addressbook-migrate.c:517
-msgid "On LDAP Servers"
-msgstr "å?¨ LDAP ä¼ºæ??å?¨"
-
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:135
-#: ../addressbook/gui/component/addressbook-component.c:138
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
-#: ../calendar/gui/calendar-component.c:232
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:189
-#: ../calendar/gui/memos-component.c:193
-#: ../calendar/gui/migration.c:484
-#: ../calendar/gui/migration.c:584
-#: ../calendar/gui/migration.c:1098
-#: ../calendar/gui/tasks-component.c:186
-#: ../calendar/gui/tasks-component.c:190
-#: ../mail/em-migrate.c:960
-#: ../plugins/email-custom-header/email-custom-header.c:337
-msgid "Personal"
-msgstr "å??äºº"
-
-#: ../addressbook/gui/component/addressbook-component.c:209
-msgctxt "New"
-msgid "_Contact"
-msgstr "è?¯çµ¡äºº(_C)"
-
-#: ../addressbook/gui/component/addressbook-component.c:210
-msgid "Create a new contact"
-msgstr "å»ºç«?æ?°ç??è?¯çµ¡äºº"
-
-#: ../addressbook/gui/component/addressbook-component.c:217
-msgctxt "New"
-msgid "Contact _List"
-msgstr "è?¯çµ¡äººæ¸?å?®(_L)"
-
-#: ../addressbook/gui/component/addressbook-component.c:218
-msgid "Create a new contact list"
-msgstr "å»ºç«?æ?°ç??è?¯çµ¡äººæ¸?å?®"
-
-#: ../addressbook/gui/component/addressbook-component.c:224
-#: ../addressbook/gui/component/addressbook-config.c:1245
-msgid "New Address Book"
-msgstr "æ?°é??è¨?é??"
-
-#: ../addressbook/gui/component/addressbook-component.c:225
-msgctxt "New"
-msgid "Address _Book"
-msgstr "é??è¨?é??(_B)"
-
-#: ../addressbook/gui/component/addressbook-component.c:226
-msgid "Create a new address book"
-msgstr "å»ºç«?æ?°é??è¨?é??"
-
-#: ../addressbook/gui/component/addressbook-component.c:389
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "å??ç´?é??è¨?é??è¨å®?å?¼æ??è³?æ??å¤¾å¤±æ??ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:217
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
-msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??ä½ ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ SSL)ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:219
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
-msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??ä½ ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ TLS)ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:221
-msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
-msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?ä½ ç??ä¼ºæ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??è¡¨ç¤ºä½ ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?ä½ ç??å®?å?¨æ??æ¼?æ´?ã?? "
-
-#: ../addressbook/gui/component/addressbook-config.c:346
-msgid "Base"
-msgstr "å?ºæ?¬"
-
-#: ../addressbook/gui/component/addressbook-config.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "_Type:"
-msgstr "é¡?å??(_T):"
-
-#: ../addressbook/gui/component/addressbook-config.c:648
-msgid "Copy _book content locally for offline operation"
-msgstr "è¤?è£½é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥(_B)"
-
-#: ../addressbook/gui/component/addressbook-config.c:759
-msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
-msgstr "é??æ?¯ LDAP ä¼ºæ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??è©¦é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?æ´½è©¢ä½ ç??ç³»çµ±ç®¡ç??å?¡ï¼?ç?è§£ä½ æ??è©²æ??å®?ç??å? ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:837
-msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
-msgstr "é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è?ä½ ç??æ?¹æ³?ã??æ³¨æ??è¦?è¨å®?æ¤é ?è?³ã??é?»å?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿å??å?å??ä½ ç?? LDAP ä¼ºæ??å?¨ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:916
-msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
-msgstr "æ??å°?ç¯?å??æ??å®?ç¾©ä½ æ?³å¾?ç¶²çµ¡ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??\"sub\" ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??ä¸?å??ã??ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:1020
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../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.glade.h:95
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "ä¸?è?¬"
-
-#: ../addressbook/gui/component/addressbook-config.c:1021
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "é??è¨?é??"
-
-#: ../addressbook/gui/component/addressbook-config.c:1025
-msgid "Server Information"
-msgstr "ä¼ºæ??å?¨è³?è¨?"
-
-#: ../addressbook/gui/component/addressbook-config.c:1027
-msgid "Authentication"
-msgstr "é©?è?"
-
-#: ../addressbook/gui/component/addressbook-config.c:1030
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "è©³ç´°è³?æ??"
-
-#: ../addressbook/gui/component/addressbook-config.c:1031
-#: ../mail/em-folder-browser.c:1021
-msgid "Searching"
-msgstr "æ£å?¨æ??å°?"
-
-#: ../addressbook/gui/component/addressbook-config.c:1033
-msgid "Downloading"
-msgstr "ä¸?è¼?ä¸"
-
-#: ../addressbook/gui/component/addressbook-config.c:1243
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "Address Book Properties"
-msgstr "é??è¨?é??å?§å®¹"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148
-#: ../mail/em-migrate.c:1109
-msgid "Migrating..."
-msgstr "æ£å?¨ç§»è½?..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195
-#: ../mail/em-migrate.c:1168
-#, c-format
-msgid "Migrating '%s':"
-msgstr "æ£å?¨ç§»è½?ã??%sã??ï¼?"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP ä¼ºæ??å?¨"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:760
-msgid "Autocompletion Settings"
-msgstr "è?ªå??å®?æ??è¨å®?"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
-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 ""
-"Evolution è?¯çµ¡äººè³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±æ?´æ?¹äº?ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"é?µå¯?æ¸?å?®è?¯çµ¡äººç??æ ¼å¼?å·²ç¶?æ?´æ?¹ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution å?²å?é?¨ä»½é?»è©±è??ç¢¼ç??æ?¹å¼?å·²ç¶?æ?´æ?¹ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution ç?? Palm Sync æ?´æ?¹è¨?é??å??æ? å°?æª?æ¡?å·²ç¶?æ?´æ?¹ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?ä½ ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:453
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "é??æ?°å?½å??ã??%sã??è³?æ??å¤¾ç?ºï¼?"
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:455
-msgid "Rename Folder"
-msgstr "é??æ?°å?½å??è³?æ??å¤¾"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:461
-msgid "Folder names cannot contain '/'"
-msgstr "è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«æ??ç·?ã??"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "æ?°å¢?é??è¨?é??(_N)"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "å?²å?ç?º vCard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:628
-#: ../calendar/gui/memos-component.c:479
-#: ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2122
-#: ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "é??æ?°å?½å??(_R)..."
-
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/calendar-component.c:631
-#: ../calendar/gui/e-calendar-table.c:1613
-#: ../calendar/gui/e-calendar-view.c:1828
-#: ../calendar/gui/e-memo-table.c:949
-#: ../calendar/gui/memos-component.c:482
-#: ../calendar/gui/tasks-component.c:475
-#: ../mail/em-folder-tree.c:2119
-#: ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35
-#: ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "å?ªé?¤(_D)"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:636
-#: ../calendar/gui/memos-component.c:487
-#: ../calendar/gui/tasks-component.c:480
-#: ../mail/em-folder-tree.c:2127
-#: ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "å±¬æ?§(_P)"
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "è?¯çµ¡äººä¾?æº?é?¸æ??å?¨"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
-msgid "Failed to authenticate.\n"
-msgstr "é©?è?è?æ?¸å¤±æ??ã??\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
-
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:519
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "è¼¸å?¥å¯?ç¢¼"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "è?ªå??å®?æ??é?·åº¦"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "å®?æ?? uris æ¸?å?®ç?? EFolderList xml"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "å®?æ?? uris æ¸?å?®ç?? EFolderList xml"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
-msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨å?¡ç??ã??æ¸?å?®æª¢è¦?è??é ?è¦½çª?æ ¼ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "é¡¯ç¤ºè?ªå??è£?é½?ç??å§?å??è??ä½?å??"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "é¡¯ç¤ºé ?è¦½çª?æ ¼"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
-msgstr "å?¨ Evolution å??è©¦è?ªå??å®?æ??ä¹?å??ï¼?å¿?é ?è¼¸å?¥ç??å?ç¬¦æ?¸ç?®ã??"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
-msgid "URI for the folder last used in the select names dialog"
-msgstr "ä¸?æ¬¡ç?¨æ?¼é?¸å??å??ç¨±å°?è©±ç??ç??è³?æ??å¤¾ URI"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-msgid "URI for the folder last used in the select names dialog."
-msgstr "ä¸?æ¬¡ç?¨æ?¼é?¸å??å??ç¨±å°?è©±ç??ç??è³?æ??å¤¾ URI"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
-msgid "Vertical pane position"
-msgstr "å??ç?´çª?æ ¼ä½?ç½®"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
-msgstr "æ?¯å?¦å¼·å?¶é¡¯ç¤ºå?¨é ?ç?®ä¸è?ªå??è£?é½?ç??è?¯çµ¡äººå§?å??è??é?»å?é?µä»¶ä½?å??ã??"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "æ?¯å?¦é¡¯ç¤ºé ?è¦½çª?æ ¼ã??"
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Autocompletion"
-msgstr "è?ªå??å®?æ??"
-
-#: ../addressbook/gui/component/autocompletion-config.c:177
-msgid "Always _show address of the autocompleted contact"
-msgstr "æ°¸é? é¡¯ç¤ºè?ªå??è£?é½?ç??è?¯çµ¡äººä½?å??(_S)"
-
-#: ../addressbook/gui/component/autocompletion-config.c:182
-msgid "Date/Time Format"
-msgstr "æ?¥æ??/æ??å?»æ ¼å¼?"
-
-#: ../addressbook/gui/component/autocompletion-config.c:185
-#: ../mail/em-mailer-prefs.c:1456
-msgid "Table column:"
-msgstr "è¡¨æ ¼æ¬?ï¼?"
-
-#: ../addressbook/gui/component/autocompletion-config.c:187
-msgid "Look up in address books"
-msgstr "å?¨é??è¨?é??ä¸æ?¥è©¢"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
-"389\n"
-"636\n"
-"3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "5"
-msgstr "5"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>é©?è?</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>ä¸?è¼?ä¸</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>æ??å°?ä¸</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid ""
-"Anonymously\n"
-"Using email address\n"
-"Using distinguished name (DN)"
-msgstr ""
-"å?¿å??\n"
-"ä½¿ç?¨é?»å?é?µä»¶ä½?å??\n"
-"ä½¿ç?¨è¾¨èª?ç??å??ç¨± (DN)"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-msgid "B_rowse this book until limit reached"
-msgstr "ç??è¦½é??å??é??è¨?é??ç?´å?°é??å?¶(_R)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution æ??ä½¿ç?¨æ¤é?»å?é?µä»¶å?°å??ï¼?å?¨ä¼ºæ??å?¨é©?è?ä½ ç??èº«ä»½ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Lo_gin:"
-msgstr "ç?»å?¥(_G):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"å?®ä¸?\n"
-"å?¯"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"SSL encryption\n"
-"TLS encryption\n"
-"No encryption"
-msgstr ""
-"SSL å? å¯?\n"
-"TLS å? å¯?\n"
-"ä¸?å? å¯?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-msgid "Search Filter"
-msgstr "æ??å°?é??æ¿¾å?¨"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-msgid "Search _base:"
-msgstr "æ??å°?èµ·é»?(_B):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search _filter:"
-msgstr "æ??å°?é??æ¿¾å?¨(_F):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
-msgstr "æ??å°?é??æ¿¾å?¨æ?¯å?¨é?²è¡?æ??å°?æ??ä½¿ç?¨ç??ç?©ä»¶é¡?å??ã??å¦?æ??æ¤é ?æ²?æ??è¢«ä¿®æ?¹ï¼?é ?è¨ç??æ??å°?ç?®æ¨?æ?¯ã??personã??ç?©ä»¶é¡?å??ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Supported Search Bases"
-msgstr "æ?¯æ?´ç??æ??å°?èµ·é»?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
-msgstr "æ??å°?å?ºç¤?æ?¯æ??é ?ç?®ç??å?¯è¾¨è?å??ç¨± (DN)ï¼?æ??å°?æ??ç?±æ¤è??é??å§?ã??å¦?æ??æ¤è??ç©ºç?½ï¼?æ??å°?æ??å?¨ç?®é??æ¨¹ç??åº?å±¤é??å§?ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "This is the full name of your LDAP server. For example, \"ldap.mycompany.com\"."
-msgstr "é??æ?¯ä½ ç?? LDAP ä¼ºæ??å?¨ç??å®?æ?´å??ç¨±ã??ä¾?å¦?ï¼?ã??ldap.mycompany.comã??ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
-msgstr "é??æ?¯è¦?ä¸?è¼?é ?ç?®ç??æ?¸ç?®ä¸?é??ã??å°?æ¤æ?¸å?è¨å®?æ??å¤ªå¤§æ??æ¸?æ?¢é??è¨?é??ç??é??åº¦ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
-msgstr "é??æ?¯æ¤ä¼ºæ??å?¨ç??å??ç¨±ï¼?æ??é¡¯ç¤ºå?¨ä½ ç?? Evolution è³?æ??å¤¾æ¸?å?®ä¸ã??å®?å??ç?¨æ?¼é¡¯ç¤ºç?¨é??ã?? "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid "_Download limit:"
-msgstr "ä¸?è¼?é??å?¶(_D):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid "_Find Possible Search Bases"
-msgstr "å°?æ?¾å?¯è?½ç??æ??å°?å?ºç¤?(_F)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid "_Login method:"
-msgstr "ç?»å?¥æ?¹æ³?(_L):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-msgid "_Name:"
-msgstr "å??ç¨±(_N):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "_Port:"
-msgstr "é?£æ?¥å? (_P):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid "_Search scope:"
-msgstr "æ??å°?ç¯?å??(_S):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-#: ../mail/mail-config.glade.h:184
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Server:"
-msgstr "ä¼ºæ??å?¨(_S):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid "_Timeout:"
-msgstr "æ??é??(_T):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "_Use secure connection:"
-msgstr "ä½¿ç?¨å®?å?¨é?£ç·?(_U):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid "cards"
-msgstr "å?¡ç??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:293
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:740
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-msgid "minutes"
-msgstr "å??é??"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>é?»å?é?µä»¶</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>ä½?å®¶</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>å?³æ??è¨?æ?¯</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>è?·æ¥</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>é??é ?</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Notes</b>"
-msgstr "<b>å??è¨»</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Other</b>"
-msgstr "<b>å?¶ä»?</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Telephone</b>"
-msgstr "<b>é?»è©±</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Web Addresses</b>"
-msgstr "<b>ç¶²å??</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:1987
+msgid "Anniversary"
+msgstr "é?±å¹´ç´?å¿µæ?¥"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "<b>Work</b>"
-msgstr "<b>å·¥ä½?</b>"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:110
+msgid "Birthday"
+msgstr "ç??æ?¥"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "å??é¡?(_T)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+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:1267
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "è?¯çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
+#: ../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:2496
 msgid "Contact Editor"
 msgstr "è?¯çµ¡äººç·¨è¼¯å?¨"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../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
+msgid "Email"
+msgstr "é?»å?é?µä»¶"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Free/Busy:"
+msgstr "ç©ºé??/å¿?ç¢?ï¼?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "Full _Name..."
 msgstr "å?¨å??(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "ä½?å®¶"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "Home Page:"
+msgstr "é¦?é ?ï¼?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Image"
 msgstr "å??ç??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Instant Messaging"
+msgstr "å?³æ??é??è¨?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Job"
+msgstr "å·¥ä½?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Mailing Address"
 msgstr "é?µå¯?å?°å??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+msgid "Miscellaneous"
+msgstr "é??é ?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Nic_kname:"
 msgstr "ç¶²å??(_K):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../calendar/gui/migration.c:1225
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../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
 msgid "Notes"
 msgstr "å??è¨»"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1695
+msgid "Other"
+msgstr "å?¶ä»?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "å??äººè³?æ??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "é?»è©±"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+msgid "Video Chat:"
+msgstr "è¦?å??è??å¤©ï¼?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+msgid "Web Addresses"
+msgstr "ç¶²å??"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "Web Log:"
+msgstr "ç¶²èª?ï¼?"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../mail/e-mail-migrate.c:954
+msgid "Work"
+msgstr "å·¥ä½?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Address:"
 msgstr "å?°å??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Anniversary:"
 msgstr "é?±å¹´ç´?å¿µæ?¥(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Assistant:"
 msgstr "å?©ç??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Birthday:"
 msgstr "ç??æ?¥(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:820
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../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:1909
 msgid "_Calendar:"
 msgstr "è¡?äº?æ??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_City:"
 msgstr "ç¸£/å¸?(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Company:"
 msgstr "å?¬å?¸(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Country:"
 msgstr "å??å®¶/å?°å??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Department:"
 msgstr "é?¨é??(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_File under:"
 msgstr "æ¸æª?ç?º(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Free/Busy:"
 msgstr "ç©ºé??/å¿?ç¢?(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Home Page:"
 msgstr "é¦?é ?(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Manager:"
 msgstr "ä¸»ç®¡(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Office:"
 msgstr "è¾¦å?¬å®¤(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
 msgstr "é?µç®±(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "è?·æ¥(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Spouse:"
 msgstr "é??å?¶(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "å·?/ç??(_S):"
 
 # (Abel) è?·ç¨±å??è¼¸å?¥é?£çµ¡äººæ??ç?? Title (Dr., Ms.) æ??è¡?çª?
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "é??é (_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Video Chat:"
 msgstr "è¦?å??äº¤è«?(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "å?¯æ?¥å?? H_TML é?µä»¶"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Web Log:"
 msgstr "ç¶²èª?(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "é??è¨?é??(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Zip/Postal Code:"
 msgstr "é?µé??å??è??(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:473
-#: ../plugins/exchange-operations/exchange-delegates.c:951
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../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:61
+#: ../widgets/menus/gal-view-new-dialog.c:60
 msgid "Name"
 msgstr "å??ç¨±"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:324
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../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:1287
+#: ../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:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../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:1816
-#: ../widgets/text/e-text.c:3674
-#: ../widgets/text/e-text.c:3675
+#: ../widgets/table/e-cell-text.c:1655 ../widgets/text/e-text.c:3429
+#: ../widgets/text/e-text.c:3430
 msgid "Editable"
 msgstr "å?¯ç·¨è¼¯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:603
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../mail/em-migrate.c:959
-msgid "Work"
-msgstr "å·¥ä½?"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
+msgid "Error adding contact"
+msgstr "æ?°å¢?è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
-msgid "Home"
-msgstr "ä½?å®¶"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+msgid "Error modifying contact"
+msgstr "ä¿®æ?¹è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
-#: ../calendar/gui/e-calendar-view.c:2289
-msgid "Other"
-msgstr "å?¶ä»?"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+msgid "Error removing contact"
+msgstr "ç§»é?¤è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Source Book"
 msgstr "ä¾?æº?é??è¨?é??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 msgid "Target Book"
 msgstr "ç?®æ¨?é??è¨?é??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
 msgid "Is New Contact"
 msgstr "æ?¯æ?°è?¯çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
 msgid "Writable Fields"
 msgstr "å?¯å¯«ç??æ¬?ä½?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
 msgid "Required Fields"
 msgstr "å¿?è¦?æ¬?ä½?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
 msgid "Changed"
 msgstr "å·²æ?´æ?¹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2491
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "è?¯çµ¡äººç·¨è¼¯å?¨ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2888
 msgid "Please select an image for this contact"
 msgstr "è«?é?¸å??ä»£è¡¨æ¤è?¯çµ¡äººç??å??ç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "_No image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3162
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1468,211 +596,208 @@ msgstr ""
 "è?¯çµ¡äººè³?æ??ç?¡æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "ã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3173
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sã??%sã??æ?¯ç©ºç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3213
 msgid "Invalid contact."
 msgstr "ç?¡æ??ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "å¿«é??æ?°å¢?è?¯çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "ç·¨è¼¯å?¨é?¨(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "å?¨å??(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "é?»å?é?µä»¶(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "é?¸æ??é??è¨?é??(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"ç¢ºå®?è¦?å?ªé?¤\n"
-"è?¯çµ¡äººæ¸?å?® (%s)ï¼?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr ""
-"ä½ ç¢ºå®?è¦?å?ªé?¤\n"
-"é??äº?è?¯çµ¡äººæ¸?å?®ï¼?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:167
+#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:675
+msgid "Shell"
+msgstr "Shell"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:676
+msgid "The EShell singleton"
 msgstr ""
-"ç¢ºå®?è¦?å?ªé?¤\n"
-"è?¯çµ¡äºº (%s)ï¼?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"ä½ ç¢ºå®?è¦?å?ªé?¤\n"
-"é??äº?è?¯çµ¡äººï¼?"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
+msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-msgstr ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
+msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "å?¨å??"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr "Jr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+msgid "Miss"
+msgstr "Miss"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr "Mr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr "Mrs."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr "Ms."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr "Sr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "å??å?(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "å§?æ°?(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "(_Middle):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "(_Suffix):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>æ??å?¡</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:692
 msgid "Contact List Editor"
 msgstr "è?¯çµ¡äººæ¸?å?®ç·¨è¼¯å?¨"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
-#: ../calendar/gui/e-day-view-time-item.c:812
-#: ../calendar/gui/e-timezone-entry.c:118
-msgid "Select..."
-msgstr "é?¸æ??..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "Members"
+msgstr "æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "ç?¶å?³é??é?»å?é?µä»¶è?³æ¤æ¸?å?®æ??é?±è??å?¶ä½?å??(_H)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "å??å?ºå??ç¨±(_L):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:154
+msgid "_Select..."
+msgstr "é?¸å??(_S)..."
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 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:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:785
 msgid "Contact List Members"
 msgstr "è?¯çµ¡äººæ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:933
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
 msgid "_Members"
 msgstr "æ??å?¡(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1185
+msgid "Error adding list"
+msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1199
+msgid "Error modifying list"
+msgstr "ç·¨è¼¯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1213
+msgid "Error removing list"
+msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
+#: ../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:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1277
 msgid "Is New List"
 msgstr "æ?¯æ?°ç??æ¸?å?®"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "æ?´æ?¹å¾?ç??è?¯çµ¡äºº:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
 msgstr "è¡?çª?ç??è?¯çµ¡äºº:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "å?µæ¸¬å?°é??è¤?ç??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+msgid ""
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
 msgstr "æ¤è?¯çµ¡äººç??å??ç¨±æ??é?»å?é?µä»¶å?°å??å·²ç¶?å?å?¨æ?¼æ¤è³?æ??å¤¾ã??ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "æ?°ç??è?¯çµ¡äºº:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "å??æ?¬ç??è?¯çµ¡äºº:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -1680,74 +805,71 @@ msgstr ""
 "æ¤è?¯çµ¡äººç??å??ç¨±æ??é?»å?é?µä»¶å?°å??å·²ç¶?å?å?¨\n"
 "æ?¼æ¤è³?æ??å¤¾ã??ä½ ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "å??ä½µ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:198
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 msgstr "å??ä½µè?¯çµ¡äºº"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:266
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
-#: ../addressbook/gui/widgets/eab-contact-display.c:868
-#: ../plugins/groupwise-features/junk-settings.c:420
-#: ../smime/lib/e-cert.c:808
-msgid "Email"
-msgstr "é?»å?é?µä»¶"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:79
-#: ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-memo-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:978
 msgid "Any field contains"
 msgstr "ä»»ä½?æ¬?ä½?å??å?«"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
 msgid "Email begins with"
 msgstr "é?»å?é?µä»¶é??å§?æ?¼"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Name contains"
 msgstr "å??ç¨±å??å?«"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "æ²?æ??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d å??è?¯çµ¡äºº"
 msgstr[1] "%d å??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+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:460
-msgid "Error getting book view"
-msgstr "å??å¾?æ?¸æ?¬æª¢è¦?æ??ç?¼ç??é?¯èª¤"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+msgid "Search Interrupted"
+msgstr "æ??å°?è¢«ä¸æ?·"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
-#: ../widgets/table/e-table-click-to-add.c:507
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
+#: ../addressbook/gui/widgets/e-addressbook-view.c:758
+#: ../calendar/gui/e-memo-table.c:1061 ../calendar/gui/e-task-table.c:1360
+#: ../modules/calendar/e-memo-shell-content.c:603
+#: ../modules/calendar/e-task-shell-content.c:625
+#: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:817
-#: ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
+#: ../widgets/table/e-table.c:3349
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
+#: ../widgets/text/e-text.c:3297
 msgid "Model"
 msgstr "æ¨¡å??"
 
@@ -1755,120 +877,82 @@ msgstr "æ¨¡å??"
 msgid "Error modifying card"
 msgstr "ç·¨è¼¯å?¡ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "å??ç¨±é??å§?æ?¼"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+msgid "Cut selected contacts to the clipboard"
+msgstr "å?ªä¸?é?¸å??ç??è?¯çµ¡äººè?³å?ªè²¼ç°¿"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+msgid "Copy selected contacts to the clipboard"
+msgstr "è¤?è£½é?¸å??ç??è?¯çµ¡äººè?³å?ªè²¼ç°¿"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+msgid "Paste contacts from the clipboard"
+msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?è?¯çµ¡äºº"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:735
+msgid "Delete selected contacts"
+msgstr "å?ªé?¤é?¸å®?ç??è?¯çµ¡äºº"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+msgid "Select all visible contacts"
+msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??è?¯çµ¡äºº"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:774
+#: ../calendar/gui/e-memo-table.c:1078 ../calendar/gui/e-task-table.c:1377
+#, fuzzy
+msgid "Shell View"
+msgstr "3_D å??é??è±¡æ£?æª¢è¦?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Source"
 msgstr "ä¾?æº?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:564
-#: ../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
-msgid "Type"
-msgstr "é¡?å??"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
-msgid "Save as vCard..."
-msgstr "å?²å?ç?º vCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??äº?è?¯çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1806
-#: ../calendar/gui/e-memo-table.c:932
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "é??å??(_O)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+msgid "Are you sure you want to delete this contact list?"
+msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??å??è?¯çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-msgid "_New Contact..."
-msgstr "æ?°å¢?è?¯çµ¡äºº(_N)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??å??è?¯çµ¡äººæ¸?å?® (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "New Contact _List..."
-msgstr "æ?°å¢?è?¯çµ¡äººæ¸?å?®(_L)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+msgid "Are you sure you want to delete these contacts?"
+msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??äº?è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Save as vCard..."
-msgstr "å?²å?æ?? _vCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+msgid "Are you sure you want to delete this contact?"
+msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??å??è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Forward Contact"
-msgstr "è½?å¯?è?¯çµ¡äºº(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??å??è?¯çµ¡äºº (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contacts"
-msgstr "è½?å¯?è?¯çµ¡äºº(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"é??å?? %d å??è?¯çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
+"ç¢ºå®?è¦?é¡¯ç¤ºé??è£?æ??æ??ç??è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contact"
-msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_M)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to List"
-msgstr "å?³é??é?µä»¶çµ¦æ¸?å?®(_M)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to Contacts"
-msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_M)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "_Print"
-msgstr "æ??å?°(_P)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
-msgid "Cop_y to Address Book..."
-msgstr "è¤?è£½å?°é??è¨?é??(_Y)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Mo_ve to Address Book..."
-msgstr "ç§»è?³é??è¨?é??(_V)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "Cu_t"
-msgstr "å?ªä¸?(_T)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1599
-#: ../calendar/gui/e-calendar-view.c:1813
-#: ../calendar/gui/e-memo-table.c:940
-#: ../mail/em-folder-tree.c:991
-#: ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2109
-#: ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:99
-#: ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "è¤?è£½(_C)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-msgid "P_aste"
-msgstr "è²¼ä¸?(_A)"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
-#: ../calendar/gui/cal-search-bar.c:624
-#: ../calendar/gui/cal-search-bar.c:667
-#: ../calendar/gui/cal-search-bar.c:686
-msgid "Any Category"
-msgstr "ä»»ä½?å??é¡?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+msgid "_Don't Display"
+msgstr "ä¸?è¦?é¡¯ç¤º(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
-#: ../calendar/gui/cal-search-bar.c:628
-#: ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Unmatched"
-msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+msgid "Display _All Contacts"
+msgstr "é¡¯ç¤ºæ??æ??ç??è?¯çµ¡äºº(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "å?©ç??"
 
@@ -1897,8 +981,7 @@ msgid "Car Phone"
 msgstr "æ±½è»?é?»è©±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../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
@@ -1906,7 +989,7 @@ msgid "Categories"
 msgstr "å??é¡?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "å?¬å?¸"
 
@@ -1955,22 +1038,22 @@ msgid "Journal"
 msgstr "æ?¥èª?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "ä¸»ç®¡"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:644
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "æµ?å??é?»è©±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "ç¶²å??"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "å??è¨»"
 
@@ -1999,14 +1082,13 @@ msgid "Radio"
 msgstr "ç?¡ç·?é?»é?»è©±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:576
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "è§?è?²"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "é??å?¶"
 
@@ -2025,6 +1107,7 @@ msgid "Telex"
 msgstr "é?»å ±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:748
 msgid "Title"
 msgstr "é??é "
 
@@ -2038,38 +1121,28 @@ 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/misc/e-reflow.c:1421
-#: ../widgets/misc/e-reflow.c:1422
-#: ../widgets/table/e-table-click-to-add.c:521
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:994
-#: ../widgets/table/e-table-group-container.c:995
+#: ../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:3069
-#: ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716
-#: ../widgets/text/e-text.c:3717
+#: ../widgets/table/e-table-item.c:2879 ../widgets/table/e-table-item.c:2880
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 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/misc/e-reflow.c:1428
-#: ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-click-to-add.c:528
-#: ../widgets/table/e-table-group-container.c:987
-#: ../widgets/table/e-table-group-container.c:988
+#: ../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:3075
-#: ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723
-#: ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:2885 ../widgets/table/e-table-item.c:2886
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Height"
 msgstr "é«?åº¦"
 
@@ -2094,11 +1167,11 @@ msgstr "æ??å?æ¨¡å??"
 msgid "Max field name length"
 msgstr "æ??å¤§æ¬?ä½?å??ç¨±é?·åº¦"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "æ¬?å¯¬"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -2108,7 +1181,7 @@ msgstr ""
 "\n"
 "æ??å°?è?¯çµ¡äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -2122,7 +1195,7 @@ msgstr ""
 "\n"
 "é?£æ??å?©ä¸?é??è£?ä»¥å»ºç«?æ?°ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -2136,7 +1209,7 @@ msgstr ""
 "\n"
 "é?£æ??å?©ä¸?é??è£?ä»¥å»ºç«?æ?°ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -2146,7 +1219,7 @@ msgstr ""
 "\n"
 "å°?æ?¾è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -2156,7 +1229,7 @@ msgstr ""
 "\n"
 "æ²?æ??é ?ç?®å?¯ä¾?é??ç¨®æª¢è¦?æ?¹å¼?é¡¯ç¤ºã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Adapter"
 msgstr "è½?æ?¥å?¨"
 
@@ -2169,7 +1242,7 @@ msgid "Home Email"
 msgstr "ä½?å®¶é?»å?é?µä»¶"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:825
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "å?¶å®?é?»å?é?µä»¶"
 
@@ -2181,254 +1254,310 @@ msgstr "å·²é?¸æ??"
 msgid "Has Cursor"
 msgstr "æ??æ¸¸æ¨?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../mail/em-popup.c:545
-msgid "_Open Link in Browser"
-msgstr "å?¨ç??è¦½å?¨å?§é??å??é?£çµ?(_O)"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "evolution é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2694
-msgid "_Copy Link Location"
-msgstr "è¤?è£½é?£çµ?ä½?å??(_C)"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "æ?°å¢?è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../mail/em-popup.c:546
-msgid "_Send New Message To..."
-msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "æ?°å¢?è?¯çµ¡äººæ¸?å?®"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "ç?®å??ç??é??è¨?é??è³?æ??å¤¾ %s æ?? %d å¼µå?¡ç??"
+msgstr[1] "ç?®å??ç??é??è¨?é??è³?æ??å¤¾ %s æ?? %d å¼µå?¡ç??"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "é??å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "è?¯çµ¡äººæ¸?å?®: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:142
+msgid "Contact: "
+msgstr "è?¯çµ¡äºº: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "Evolution è¿·ä½ å?¡ç??"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:286
-#: ../addressbook/gui/widgets/eab-contact-display.c:360
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:370
+msgid "Copy the email address to the clipboard"
+msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??å?°å?ªè²¼ç°¿"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:375
+msgid "_Send New Message To..."
+msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:377
+msgid "Send a mail message to this address"
+msgstr "å?³é??é?µä»¶å?°é??å??ä½?å??"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(æ? å°?)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
-#: ../addressbook/gui/widgets/eab-contact-display.c:391
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "å°?æ? "
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:475
-#: ../addressbook/gui/widgets/eab-contact-display.c:835
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "æ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "é?¨é??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "è?·æ¥"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "è¦?å??äº¤è«?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
-#: ../calendar/gui/calendar-commands.c:89
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2548
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:572
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
-#: ../plugins/hula-account-setup/camel-hula-listener.c:372
-#: ../plugins/hula-account-setup/camel-hula-listener.c:400
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../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
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ç©ºé??/å¿?ç¢?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "é?»è©±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "å?³ç??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Address"
 msgstr "å?°å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "ç¶²èª?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
-#: ../calendar/gui/e-calendar-view.c:2580
-msgid "Birthday"
-msgstr "ç??æ?¥"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../calendar/gui/e-calendar-view.c:2581
-msgid "Anniversary"
-msgstr "é?±å¹´ç´?å¿µæ?¥"
+#. 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
+#: ../mail/e-mail-migrate.c:955
+#: ../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
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:158
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../plugins/email-custom-header/email-custom-header.c:320
+msgid "Personal"
+msgstr "å??äºº"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:853
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "è?·ç¨±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:897
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "Blog"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../widgets/misc/e-web-view.c:750
+#, c-format
+msgid "Click to mail %s"
+msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../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:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "å¾?ç«¯å¿?ç¢?"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../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:62
+#: ../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:63
+#: ../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:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../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:67
+#: ../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:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "è?¯çµ¡äºº ID å·²ç¶?å?å?¨"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-cal-model-tasks.c:363
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:661
-#: ../calendar/gui/print.c:2548
+#. 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:223
+#: ../calendar/gui/e-task-table.c:238 ../calendar/gui/e-task-table.c:596
+#: ../calendar/gui/print.c:2608
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../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:72
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "é©?è¨¼å¤±æ??"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../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:74
+#: ../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:76
+#: ../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:77
+#: ../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:78
+#: ../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:79
+#: ../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:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
-msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
+#: ../addressbook/gui/widgets/eab-gui-util.c: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 "
+"load the address book once in online mode to download its contents."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??é??å?¯è?½è¡¨ç¤ºæ¤é??è¨?é??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?ä»¥ä¾?é?¢ç·?ä½¿ç?¨ã??è«?æ?¼ä¸?ç·?æ¨¡å¼?å??æ¬¡è®?å??é??è¨?é??ä»¥ä¸?è¼?å®?ç??å?§å®¹ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
-msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??è«?æª¢æ?¥è·¯å¾? %s æ?¯å?¦å?å?¨è??ä¸?æ¬?é??å·²è¨å®?å?¯ä»¥å?å??å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
-msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr "æ¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è¯é?²å?»ã??å¦?æ??ä½ æ?³å?¨ Evolution ä½¿ç?¨ LDAPï¼?å¿?é ?å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?ä»¶ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??é??è¡¨ç¤ºä½ è¼¸å?¥é?¯èª¤ç??URIï¼?æ??ä¼ºæ??å?¨ç?¡æ³?é?£ç·?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "è©³ç´°ç??é?¯èª¤è¨?æ?¯:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2440,7 +1569,7 @@ msgstr ""
 "è«?ä½¿ç?¨æ?´å? æ??ç¢ºç??æ?¥è©¢æ??æ?¯æ??é«?æ¤ç?®é??æ??å??ç??ç?®é??\n"
 "ä¼ºæ??å?¨å??å¥½è¨å®?ä¸ç??çµ?æ??é??å?¶ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 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"
@@ -2452,194 +1581,96 @@ msgstr ""
 "æ??æ?¯æ??é«?æ¤ç?®é??æ??å??ç??ç?®é??ä¼ºæ??å?¨å??å¥½è¨å®?ä¸ç??\n"
 "æ??é??ä¸?é??ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "æ¤ç?®é??æ??å??ç??å¾?ç«¯ç¨?å¼?ç?¡æ³?è§£æ??é??æ¬¡ç??æ?¥è©¢ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr "æ¤ç?®é??æ??å??ç??å¾?ç«¯ç¨?å¼?æ??çµ?å?·è¡?é??æ¬¡ç??æ?¥è©¢ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "é??æ¬¡ç??æ?¥è©¢ä¸¦æ?ªå®?å?¨æ??å??ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:685
-msgid "Error adding contact"
-msgstr "æ?°å¢?è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "ç·¨è¼¯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "ä¿®æ?¹è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:635
-msgid "Error removing contact"
-msgstr "ç§»é?¤è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"é??å?? %d å??è?¯çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
-"ç¢ºå®?è¦?é¡¯ç¤ºé??å??è?¯çµ¡äººï¼?"
-msgstr[1] ""
-"é??å?? %d å??è?¯çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
-"ç¢ºå®?è¦?é¡¯ç¤ºé??äº?è?¯çµ¡äººï¼?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "ä¸?è¦?é¡¯ç¤º(_D)"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "é¡¯ç¤ºæ??æ??ç??è?¯çµ¡äºº(_A)"
-
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s å·²ç¶?å?å?¨\n"
-"ä½ æ?¯å?¦è¦?è¦?å¯«å®?ï¼?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:354
-msgid "Overwrite"
-msgstr "è¦?å¯«"
-
-#. more than one, finding the total number of contacts might
-#. * hit performance while saving large number of contacts
-#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "å??è?¯çµ¡äºº"
-msgstr[1] "å??è?¯çµ¡äºº"
-
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:480
+#: ../addressbook/gui/widgets/eab-gui-util.c:244
 msgid "Select Address Book"
 msgstr "é?¸æ??é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "æ¸?å?®"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:746
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Move contact to"
 msgstr "å°?è?¯çµ¡äººç§»å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:434
 msgid "Copy contact to"
 msgstr "è¤?è£½è?¯çµ¡äººå?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contacts to"
 msgstr "å°?è?¯çµ¡äººç§»å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contacts to"
 msgstr "è¤?è£½è?¯çµ¡äººå?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "å¤?é?? vCard"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "%s ç?? vCard"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "è?¯çµ¡äººè³?è¨?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s ç??è?¯çµ¡äººè³?è¨?"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:291
-msgid "Querying Address Book..."
-msgstr "æ£å?¨æ?¥è©¢é??è¨?é??â?¦"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "å?¡ç??æª¢è¦?æ¨¡å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:512
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../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:687
-#: ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "å?¯å?¥..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:862
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:871
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:880
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP è³?æ??äº¤æ??æ ¼å¼? (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF è¼¸å?¥å?¨"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:556
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcfã??.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:557
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard å?¯å?¥ç¨?å¼?"
 
@@ -2682,49 +1713,84 @@ msgid "Export in asynchronous mode"
 msgstr "å?¨é??å??æ¥æ¨¡å¼?å?¯å?º"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:59
-msgid "The number of cards in one output file in asynchronous mode, default size 100."
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr "é??å??æ¥æ¨¡å¼?ä¸?ï¼?ä¸?å??è¼¸å?ºæª?æ¡?ä¸ç??å?¡ç??æ?¸ç?®ï¼?é ?è¨å¤§å°?æ?¯ 100ã??"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "æ?¸é??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:99
-msgid "Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/tools/evolution-addressbook-export.c:101
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "æ??ä»¤å??å¼?æ?¸é?¯èª¤ï¼?è«?ä½¿ç?¨ --help é?¸é ?ä¾?æ?¥ç??ç?¨æ³?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "å??æ?¯æ?´ csv æ?? vcard æ ¼å¼?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "å?¨é??å??æ¥æ¨¡å¼?ä¸?ï¼?è¼¸å?ºå¿?é ?æ?¯æª?æ¡?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "å?¨ä¸?è?¬æ¨¡å¼?ä¸?ï¼?ä¸?é??è¦?å¤§å°?é?¸é ?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "æ?ªè??ç??ç??é?¯èª¤"
 
+#: ../addressbook/util/addressbook.c:103
+msgid "Accessing LDAP Server anonymously"
+msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
+
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:525
+msgid "Failed to authenticate.\n"
+msgstr "é©?è?è?æ?¸å¤±æ??ã??\n"
+
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#, 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:518
+#: ../plugins/publish-calendar/publish-calendar.c:328
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "è¼¸å?¥å¯?ç¢¼"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¸¦ä¸?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?è¡?äº?æ??æª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??è¡?äº?æ??ã??"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¾?æº?ã??è«?é?¸å??ä¸?å??è?½å? å?¥ç´?æ??ç??è¡?äº?æ??ã??"
 
 #: ../calendar/calendar.error.xml.h:5
-msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients 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."
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
 msgstr "æ?°å¢?æ??æ??ç¾©ç??æ??è¦?å?°ä½ ç??å·¥ä½?å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??ä½ ç??å·¥ä½?å??ä»?éº¼äº?æ??é??ã??"
 
 #: ../calendar/calendar.error.xml.h:7
@@ -2736,7 +1802,9 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤å??å¿?é??ä¸ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on these appointments will be deleted and can not be restored."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr "æ??å?ªé?¤é??äº?ç´?æ??ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -2744,11 +1812,13 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤é??äº?å·¥ä½?ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤ç´?æ??ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤æ??è°ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:13
@@ -2768,540 +1838,473 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤æ¨?é¡?ç?º '{0}' ç??ç´?æ??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "ç¢ºå®?è¦?å?ªé?¤æ¨?é¡?ç?ºã??{0}ã??ç??æ??è°ï¼?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤å??å¿?é?? '{0}'ï¼?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é?? {0} ç´?æ??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é?? {0} å??å??å¿?é??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é?? {0} å·¥ä½?ï¼?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤æ¤ç´?æ??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤æ¤æ??è°ï¼?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤æ¤å??å¿?é??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤æ¤å·¥ä½?ï¼?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "ç¢ºå®?è¦?å?²å?æ²?æ??æ??è¦?ç??å??å¿?é??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "ä½ ç¢ºå®?è¦?å?³é??æ²?æ??æ??è¦?ç??ç´?æ??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "ä½ ç¢ºå®?è¦?å?³é??æ²?æ??æ??è¦?ç??å·¥ä½?ï¼?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
 msgstr "è¡?äº?æ??è³?æ??åº«å·²é?¢ç·?ã??"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "ä¸?è?½å»ºç«?æ?°ç??äº?ä»¶"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot save event"
 msgstr "ä¸?è?½å?²å?äº?ä»¶"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete calendar '{0}'?"
 msgstr "å?ªé?¤è¡?äº?æ??ã??{0}ã??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete memo list '{0}'?"
 msgstr "å?ªé?¤å??å¿?é??æ¸?å?®ã??{0}ã??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete task list '{0}'?"
 msgstr "å?ªé?¤å·¥ä½?æ¸?å?®ã??{0}ã??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "ä¸?è¦?å?³é??(_N)"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ä¸?è¼?å°?å?¨é?²è¡?ä¸ã??ä½ æ?¯å?¦è¦?å?²å?æ¤ç´?æ??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ä¸?è¼?å°?å?¨é?²è¡?ä¸ã??ä½ æ?¯å?¦è¦?å?²å?æ¤å·¥ä½?ï¼?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "ç?¡æ³?è¼?å?¥ç·¨è¼¯å?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:38
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
+#: ../calendar/calendar.error.xml.h:39
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr "é?»å?é?µä»¶é??è«?æ??å?³é??çµ¦æ??æ??å??è??è??ä¸¦è®?ä»?å??æ?¥å??æ¤å·¥ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:39
-msgid "Email invitations will be sent to all participants and allow them to reply."
+#: ../calendar/calendar.error.xml.h:40
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr "é?»å?é?µä»¶é??è«?å?½æ??å?³é??çµ¦æ??æ??å??è??è??ä¸¦è®?ä»?å??å??è¦?ã??"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "è¼?å?¥è¡?äº?æ??æ??ç?¼ç??é?¯èª¤"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "è¼?å?¥å??å¿?é??æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "è¼?å?¥å·¥ä½?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error on '{0}'"
 msgstr "ã??{0}ã??ç?¼ç??é?¯èª¤"
 
-#: ../calendar/calendar.error.xml.h:45
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+#: ../calendar/calendar.error.xml.h:46
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr "å¦?æ??ä¸?å?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??æ??è°å·²ç¶?å??æ¶?ã??"
 
-#: ../calendar/calendar.error.xml.h:46
-msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+#: ../calendar/calendar.error.xml.h:47
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??è©²å??å¿?é??å·²ç¶?å?ªé?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:47
-msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+#: ../calendar/calendar.error.xml.h:48
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??å·¥ä½?å·²ç¶?å?ªé?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "ä¼ºæ??å?¨æ²?æ??å??æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "Save Appointment"
-msgstr "å?²å?ç´?æ??"
-
 #: ../calendar/calendar.error.xml.h:50
-msgid "Save Memo"
-msgstr "å?²å?å??å¿?é??"
-
-#: ../calendar/calendar.error.xml.h:51
-msgid "Save Task"
-msgstr "å?²å?å·¥ä½?"
-
-#: ../calendar/calendar.error.xml.h:52
-msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?å??è¨±å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:53
-msgid "Sending updated information allows other participants to keep their task lists up to date."
+#: ../calendar/calendar.error.xml.h:51
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?è®?å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??å·¥ä½?æ¸?å?®ã??"
 
-#: ../calendar/calendar.error.xml.h:55
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+#: ../calendar/calendar.error.xml.h:52
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr "é??è£?æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??ä»¶ã??å?²å?æ¤ç´?æ??å°?æ??å¤±å?»é??äº?é??ä»¶ã??"
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+#: ../calendar/calendar.error.xml.h:53
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr "é??è£?æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??ä»¶ã??å?²å?æ¤å·¥ä½?å°?æ??å¤±å?»é??äº?é??ä»¶ã??"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨ä½ ç?®å??ç??ä¼ºæ??å?¨ç??æ?¬ä¸?æ£å¸¸é??ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution å??å¿?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution å·¥ä½?å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "æ¤è¡?äº?æ??å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "æ¤å??å¿?é??æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "æ¤å·¥ä½?æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "é??å??è¡?äº?æ??å°?æ??è¢«æ°¸é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "é??å??å??å¿?é??æ¸?å?®å°?æ??è¢«æ°¸é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "é??é ?å·¥ä½?æ¸?å?®å°?æ??è¢«æ°¸é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:65
 msgid "Unable to load the calendar"
 msgstr "ç?¡æ³?è¼?å?¥è¡?äº?æ??"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this appointment?"
 msgstr "è¦?å?²å?å°?æ¤ç´?æ??æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to save your changes to this meeting?"
+msgstr "è¦?å?²å?å°?æ¤æ??è°æ??å??ç??æ?´æ?¹ï¼?"
+
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this memo?"
 msgstr "è¦?å?²å?å°?æ¤å??å¿?é??æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this task?"
 msgstr "è¦?å?²å?å°?æ¤å·¥ä½?æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "æ?¯å?¦è¦?å?³é??æ¤å??å¿?é??ç??å??æ¶?é??ç?¥ï¼?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "è¦?å?³é??å??æ¶?é??ç?¥çµ¦æ??æ??ç??å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "è¦?å?³é??æ??è°é??è«?çµ¦å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send this task to participants?"
 msgstr "è¦?å?³é??æ¤å·¥ä½?çµ¦å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "è¦?å?³é??æ??è°æ?´æ?°è³?è¨?çµ¦å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send updated task information to participants?"
 msgstr "è¦?å?³é??æ?´æ?°ç??å·¥ä½?è³?è¨?çµ¦å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:78
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
+#: ../calendar/calendar.error.xml.h:76
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
 msgstr "ä½ æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??æ?¬ã??"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ¤ç´?æ??ï¼?ä½?å°?æ?ªå?²å?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:78
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "ä½ å·²ç¶?æ?´æ?¹æ¤æ??è°ï¼?ä½?å°?æ?ªå?²å?å®?ã??"
+
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this task, but not yet saved it."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ¤å·¥ä½?ï¼?ä½?å°?æ?ªå?²å?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ¤å??å¿?é??ï¼?ä½?å°?æ?ªå?²å?å®?å??ã??"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨ä½ ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨ä½ ç??å??å¿?é??ã??"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨ä½ ç??å·¥ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "æ?¾æ£?æ?´æ?¹(_D)"
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/e-composer-actions.c:343
+#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "å?²å?(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:86
 msgid "_Save Changes"
 msgstr "å?²å?æ?´æ?¹(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34
-#: ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Send Notice"
 msgstr "å?³é??é??ç?¥(_S)"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:89
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:248
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "å??å?²å¤?æ?¥äº?ä»¶:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1513
-#: ../calendar/conduits/calendar/calendar-conduit.c:1514
-#: ../calendar/conduits/memo/memo-conduit.c:807
-#: ../calendar/conduits/memo/memo-conduit.c:808
-#: ../calendar/conduits/todo/todo-conduit.c:1007
-#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../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 è³?æ??ä¼ºæ??å?¨"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1621
-#: ../calendar/conduits/calendar/calendar-conduit.c:1624
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "ç?¡æ³?è®?å?? pilot è¡?äº?æ??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/memo/memo-conduit.c:901
-#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å??å¿?é??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/memo/memo-conduit.c:948
-#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "ç?¡æ³?å¯«å?¥ pilot å??å¿?é??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/todo/todo-conduit.c:227
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "é ?è¨å?ªå??é ?åº?:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1091
-#: ../calendar/conduits/todo/todo-conduit.c:1094
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å¾?è¾¦äº?é ?ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1136
-#: ../calendar/conduits/todo/todo-conduit.c:1139
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å¾?è¾¦äº?é ?ç¨?å¼?å??å¡?"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2549
-msgid "Calendar and Tasks"
-msgstr "è¡?äº?æ??è??å·¥ä½?"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:819
-#: ../calendar/gui/calendar-component.c:1238
-msgid "Calendars"
-msgstr "è¡?äº?æ??"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "å?¨é??è£?è¨å®?ä½ ç??æ??å??ã??è¡?äº?æ??è??å·¥ä½?æ¸?å?®"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution è¡?äº?æ??å??å·¥ä½?"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution è¡?äº?æ??çµ?æ??æ?§å?¶"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution è¡?äº?æ??æ??ç¨?è¨?æ?¯æª¢è¦?å?¨"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution è¡?äº?æ??/å·¥ä½?ç·¨è¼¯å?¨"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolution ç??è¡?äº?æ??é??ä»¶"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Evolution ç??å??å¿?é??å??ä»¶"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Evolution ç??å·¥ä½?é??ä»¶"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "å??å¿?é??(_S)"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293
-#: ../calendar/gui/e-memos.c:1123
-#: ../calendar/gui/gnome-cal.c:1846
-#: ../calendar/gui/memos-component.c:564
-#: ../calendar/gui/memos-component.c:882
-#: ../calendar/gui/memos-control.c:386
-#: ../calendar/gui/memos-control.c:402
-msgid "Memos"
-msgstr "å??å¿?é??"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725
-#: ../calendar/gui/e-tasks.c:1426
-#: ../calendar/gui/gnome-cal.c:1714
-#: ../calendar/gui/print.c:1973
-#: ../calendar/gui/tasks-component.c:557
-#: ../calendar/gui/tasks-component.c:879
-#: ../calendar/gui/tasks-control.c:524
-#: ../calendar/gui/tasks-control.c:540
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:751
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "å·¥ä½?"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "è¡?äº?æ??(_C)"
-
-#. Tasks
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:328
-#: ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "å·¥ä½?(_T)"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution è¡?äº?æ??é¬§é?´é??ç?¥æ??å??"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 msgstr[1] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:449
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../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 ../filter/filter.ui.h:15
+#: ../plugins/caldav/caldav-source.c:496
 #: ../plugins/calendar-file/calendar-file.c:294
 #: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:741
+#: ../plugins/calendar-weather/calendar-weather.c:517
 #: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-source.c:740
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "å?¨é?¨è§£é?¤(_A)"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
-#: ../calendar/gui/e-itip-control.c:1164
-#: ../plugins/itip-formatter/itip-view.c:1023
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1574
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Location:"
 msgstr "ä½?ç½®:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "å¿½ç?¥æ??é??(_T):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "è§£é?¤(_D)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1038
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:167
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../ui/evolution-addressbook.xml.h:51
-#: ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:42
-#: ../widgets/menus/gal-define-views.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:151
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1605
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "å»¶æ??(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "ç´?æ??ç??å?°é»?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1441
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1565
+#: ../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 ../filter/filter.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/caldav/caldav-source.c:495
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:516
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/google-account-setup/google-source.c:739
+msgid "minutes"
+msgstr "å??é??"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1435
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1557
 msgid "No summary available."
 msgstr "æ²?æ??å?¯ç?¨ç??æ??è¦?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1450
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1452
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1444
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1446
 msgid "No description available."
 msgstr "æ²?æ??ä»»ä½?æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
 msgid "No location information available."
 msgstr "æ²?æ??å?¯ç?¨ç??å?°é»?è³?è¨?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
 #, c-format
 msgid "You have %d alarms"
 msgstr "ä½ æ?? %d å??é¬§é?´"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1665
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3313,10 +2316,11 @@ msgstr ""
 "é??å?ºé?»å?é?µä»¶ã??  Evolution æ??é¡¯ç¤º\n"
 "æ?®é??ç??æ??é??å°?è©±ç??ä¾?ä»£æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3329,25 +2333,16 @@ msgstr ""
 "\n"
 "ä½ ç¢ºå®?è¦?å?·è¡?é??å??ç¨?å¼?ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??è©¢å??æ??é??æ?¼é??å??ç¨?å¼?ã??"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "ç?¡æ³?å??å§?å?? Bonobo"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid "Could not create the alarm notify service factory, maybe it's already running..."
-msgstr "ç?¡æ³?å»ºç«?è?²é?³æ??é??æ??å??å??ä»¶å·¥å» ï¼?ä¹?è¨±å®?å·²ç¶?å?¨å?·è¡?ä¸..."
-
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "å¤±æ??æ??é??"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69
-#: ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -3356,8 +2351,7 @@ msgstr[0] "%d æ??"
 msgstr[1] "%d æ??"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75
-#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -3368,8 +2362,7 @@ msgstr[1] "%d å??"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -3382,7 +2375,7 @@ msgid "Alarm programs"
 msgstr "é¬§é?´ç¨?å¼?"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "é?¯èª¤è¨?æ?¯å?¨ç??æ??å??ä¸é¡¯ç¤ºç??æ??é??(ç§?)ã??"
 
@@ -3407,7 +2400,8 @@ msgid "Check this to use system timezone in Evolution."
 msgstr "æ ¸å??æ¤é?¸é ?æ??å?¨ Evolution ä¸ä½¿ç?¨ç³»çµ±æ??å??ã??"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "å?¨æ??å?»å??ä¸ç?¨ä¾?ç¹ªè£½ Marcus Bains ç·?ç??è?²å½©(ç??ç©ºè¡¨ç¤ºä½¿ç?¨é ?è¨å?¼)ã??"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
@@ -3495,550 +2489,438 @@ 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
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?ä¸é¡¯ç¤ºå??å¿?é??é ?è¦½çª?æ ¼ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?ä¸é¡¯ç¤ºå·¥ä½?é ?è¦½çª?æ ¼ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "å?¨ã??æ?¥ã??å??ã??å·¥ä½?é?±ã??æª¢è¦?ä¸é¡¯ç¤ºé??é??ï¼?ä»¥å??é??è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
 msgstr "ä¸?æ¬¡é¬§é?´æ??å?»"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "æ??è¨?é??ç??é?µä»¶ç?ç´?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of recently used second time zones in a Day View."
 msgstr "æ??è¿?å?¨æ?¥æª¢è¦?ä¸ä½¿ç?¨ç??ç¬¬äº?æ??å??æ¸?å?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "List of server URLs for free/busy publishing."
 msgstr "ç?¨æ?¼ç©ºé??/å¿?ç¢?ç?¼ä½?ç??ä¼ºæ??å?¨ URL æ¸?å?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains ç·?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains ç·?è?²å½©â??æ?¥æª¢è¦?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains ç·?è?²å½©â??æ??å?»å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
-msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+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:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
 msgstr "è¦?è¨?ä½?ç??æ??è¿?ä½¿ç?¨æ??å??æ?¸ç?®ç??æ??å¤§å?¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+msgid "Memo layout style"
+msgstr "å??å¿?é??é??ç½®æ?¹å¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (horizontal)"
+msgstr "å??å¿?é??é ?è¦½çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+msgid "Memo preview pane position (vertical)"
+msgstr "å??å¿?é??é ?è¦½çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "å·¥ä½?æ?¥çµ?æ??å??é??ï¼?0 å?° 59ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "å·¥ä½?æ?¥é??å§?å??é??ï¼?0 å?° 59ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view horizontal pane position"
 msgstr "æ??æª¢è¦?ç??æ°´å¹³çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Month view vertical pane position"
 msgstr "æ??æª¢è¦?ç??å??ç?´çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining a default reminder."
 msgstr "æ±ºå®?é ?è¨æ??é??ç??å?®ä½?æ?¸ç?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Number of units for determining when to hide tasks."
 msgstr "æ±ºå®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?æ?¸ç?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Overdue tasks color"
 msgstr "é??æ??ç??å·¥ä½?è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
 msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
 msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
-msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨è¡?äº?æ??æ¸?å?®è??æ?¥æ??å°?è¦½è¡?äº?æ??ä¹?é??ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr "æ?¹å??ç?ºå??ç?´æ??å??å¿?é??é ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
-msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨å·¥ä½?æ¸?å?®è??å·¥ä½?é ?è¦½çª?æ ¼ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr "æ?¹å??ç?ºæ°´å¹³æ??å·¥ä½?é ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Position of the task preview pane when oriented vertically."
+msgstr "æ?¹å??ç?ºå??ç?´æ??å·¥ä½?é ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+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
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
 msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
-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."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
 msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary calendar"
 msgstr "ä¸»è¦?è¡?äº?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary memo list"
 msgstr "ä¸»è¦?å??å¿?é??æ¸?å?®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Primary task list"
 msgstr "ä¸»è¦?å·¥ä½?æ¸?å?®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Programs that are allowed to be run by alarms."
 msgstr "ç?¨ä¾?å??ç?ºé¬§é?´è??å?·è¡?ç??ç¨?å¼?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Recently used second time zones in a Day View"
 msgstr "æ??è¿?å?¨æ?¥æª¢è¦?ä¸ä½¿ç?¨ç??ç¬¬äº?æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
 msgstr "å?²å?é¬§é?´é?³æ??æª?ç?®é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Scroll Month View by a week"
 msgstr "ä»¥é?±ç?ºå?®ä½?æ?²å??æ??æª¢è¦?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º è§?è?² æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show appointment end times in week and month views"
 msgstr "å?¨é?±å??æ??ç??æª¢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "å?¨äº?ä»¶/æ??è°/å·¥ä½?ç·¨è¼¯å?¨ä¸é¡¯ç¤º å??é¡? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
 msgstr "å?¨é??ç?¥å??ä¸é¡¯ç¤ºé¬§é?´ç?«é?¢"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Show the \"Preview\" pane"
-msgstr "é¡¯ç¤ºã??é ?è¦½ã??çª?æ ¼"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr "é¡¯ç¤ºå??å¿?é??é ?è¦½çª?æ ¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show the \"Preview\" pane."
-msgstr "é¡¯ç¤ºã??é ?è¦½ã??çª?æ ¼ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "é¡¯ç¤ºå·¥ä½?é ?è¦½çª?æ ¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
 msgstr "å?¨äº?ä»¶/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º æ??å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show type field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º é¡?å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../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:71
+#: ../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:72
-msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
 msgstr "å¦?æ??è¨å®?å??æ??å?¨æ?¥æª¢è¦?ä¸é¡¯ç¤ºç¬¬äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??è¨å®?é?µç??ç?¨æ³?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task layout style"
+msgstr "å·¥ä½?é??ç½®æ?¹å¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (horizontal)"
+msgstr "å·¥ä½?é ?è¦½çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Task preview pane position (vertical)"
+msgstr "å·¥ä½?é ?è¦½çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Tasks due today color"
 msgstr "ä»?å¤©å?°æ??å·¥ä½?ç??è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Tasks vertical pane position"
-msgstr "å·¥ä½?å??ç?´çª?æ ¼ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr "ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??ç¶²å??ç¯?æ?¬ï¼?%u è¦?ä»¥é?»å?é?µä»¶ä½?å??ç??ä½¿ç?¨è??å??ç¨±é?¨å??ä¾?å??ä»£ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??ç¨±ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr "ç?¨æ?¼è¡?äº?æ??ä¸æ?¥æ??è??æ??å?»ç??é ?è¨æ??å??ï¼?æ?ªç¿»è¯ç?? Olsen æ??å??è³?æ??åº«ä½?ç½®å°±å?? \"America/New York\"ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+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ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®æ??é??ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+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ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®æ??é??ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
 msgstr "ç?¨æ?¼æ?¥æª¢è¦?ç??ç¬¬äº?æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+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:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
 msgstr "æ??é??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
 msgstr "ä¸?æ¬¡é¬§é?´å?·è¡?ç??æ??é??(_T)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Timezone"
 msgstr "æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
-msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
 msgstr "è¡?äº?æ??æª¢è¦?ä¸ç??äº?ä»¶é??æ??å??æ??æ??ï¼?æ?¸å?¼ä»?æ?¼ 0 (å®?å?¨é??æ??)å?° 10 (ä¸?é??æ??)ä¹?é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
 msgstr "24 å°?æ??å?¶æ ¼å¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "çª?é¡¯ç??(ã??ä¸»è¦?ã??)è¡?äº?æ??ç?? URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "çª?é¡¯ç??(ã??ä¸»è¦?ã??)å??å¿?é??æ¸?å?®ç?? URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "çª?é¡¯ç??(ã??ä¸»è¦?ã??)å·¥ä½?æ¸?å?®ç?? URI"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "é ?è¨æ??é??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "æ±ºå®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use system timezone"
 msgstr "ä½¿ç?¨ç³»çµ±æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr "ä½¿ç?¨ç³»çµ±æ??å??å??ä»£å?¨ Evolution ä¸é?¸å??ç??æ??å??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+msgid "Vertical pane position"
+msgstr "å??ç?´çª?æ ¼ä½?ç½®"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Week start"
 msgstr "ä¸?é?±é??å§?æ?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "æ¯?é?±ç??é??å§?ï¼?å¾?æ??æ??æ?¥ (0) å?°æ??æ??å? (6)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥å??é¡¯ç¤ºé¬§é?´ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "å?ªé?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?ç¢ºèª?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "æ¸?é?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?ç¢ºèª?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+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:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "æ?¯å?¦å?¨é?±å??æ??ç??æª¢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "æ?¯å?¦å?¨è¡?äº?æ??ä¸ç¹ªå?º Marcus Bains ç·?ï¼?ä»£è¡¨ç?®å??æ??å?»ç??ç?´ç·?ï¼?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "æ?¯å?¦å?¨å·¥ä½?æª¢è¦?ä¸é?±è??å®?æ??ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "æ?¯å?¦ä»¥é?±ç?ºå?®ä½?æ?²å??æ??æª¢è¦?ï¼?è??é??ä»¥æ??ç?ºå?®ä½?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to set a default reminder for appointments."
 msgstr "æ?¯å?¦è¨å®?ç´?æ??ç??é ?è¨æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º è§?è?² æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+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:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º æ??å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º é¡?å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../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:112
+#: ../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:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Work days"
 msgstr "å·¥ä½?æ?¥"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end hour"
 msgstr "å·¥ä½?æ?¥çµ?æ??å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday end minute"
 msgstr "å·¥ä½?æ?¥çµ?æ??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start hour"
 msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
 msgid "Workday start minute"
 msgstr "å·¥ä½?æ?¥é??å§?å??é??"
 
-#: ../calendar/gui/cal-editor-utils.c:100
+#: ../calendar/gui/cal-editor-utils.c:102
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
-#: ../calendar/gui/cal-search-bar.c:74
-msgid "Summary contains"
-msgstr "ä¸»æ?¨å??å?«"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Description contains"
-msgstr "æ??è¿°å??å?«"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Category is"
-msgstr "å??é¡?ç?º"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Comment contains"
-msgstr "å??è¨»å??å?«"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Location contains"
-msgstr "ä½?ç½®å??å?«"
-
-#: ../calendar/gui/cal-search-bar.c:636
-msgid "Next 7 Days' Tasks"
-msgstr "æ?ªä¾? 7 å¤©ç??å·¥ä½?"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Active Tasks"
-msgstr "é?²è¡?ä¸ç??å·¥ä½?"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Overdue Tasks"
-msgstr "é??æ??ç??å·¥ä½?"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Completed Tasks"
-msgstr "å·²å®?æ??ç??å·¥ä½? "
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Tasks with Attachments"
-msgstr "æ??é??å? æª?æ¡?ç??å·¥ä½?"
-
-#: ../calendar/gui/cal-search-bar.c:698
-msgid "Active Appointments"
-msgstr "é?²è¡?ä¸ç??ç´?æ??"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Next 7 Days' Appointments"
-msgstr "æ?ªä¾? 7 å¤©ç??ç´?æ??(_P)"
-
-# zh_HK: msgstr "æ??å?°"
-#: ../calendar/gui/calendar-commands.c:89
-#: ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:71
-#: ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "æ??å?°"
-
-#: ../calendar/gui/calendar-commands.c:331
-msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
-msgstr "æ¤ä½?æ¥æ??æ°¸ä¹?æ?§å?ªé?¤æ¯?é?¸å??æ??é??é??è??ç??æ??æ??äº?ä»¶ã??å¦?æ??ä½ ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?äº?ä»¶ã??"
-
-#: ../calendar/gui/calendar-commands.c:337
-msgid "Purge events older than"
-msgstr "æ¸?é?¤æ?©æ?¼é??æ®µæ??é??ç??äº?ä»¶"
-
-#: ../calendar/gui/calendar-commands.c:342
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:295
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:742
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "å¤©"
-
-#. Create the Webcal source group
-#: ../calendar/gui/calendar-component.c:194
-#: ../calendar/gui/memos-component.c:152
-#: ../calendar/gui/migration.c:504
-#: ../calendar/gui/migration.c:603
-#: ../calendar/gui/migration.c:1117
-#: ../calendar/gui/tasks-component.c:149
-msgid "On The Web"
-msgstr "å?¨ç¶²ç«?ä¸?"
-
-#: ../calendar/gui/calendar-component.c:195
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "å¤©æ°£"
-
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:289
-#: ../calendar/gui/calendar-component.c:291
-#: ../calendar/gui/migration.c:398
-msgid "Birthdays & Anniversaries"
-msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
-
-#: ../calendar/gui/calendar-component.c:626
-msgid "_New Calendar"
-msgstr "æ?°å¢?è¡?äº?æ??(_N)"
-
-#: ../calendar/gui/calendar-component.c:627
-#: ../calendar/gui/memos-component.c:478
-#: ../calendar/gui/tasks-component.c:471
-#: ../mail/em-folder-tree.c:2114
-msgid "_Copy..."
-msgstr "è¤?è£½(_C)..."
-
-#: ../calendar/gui/calendar-component.c:632
-#: ../calendar/gui/memos-component.c:483
-#: ../calendar/gui/tasks-component.c:476
-msgid "_Make available for offline use"
-msgstr "æ¨?è¨?ç?ºä¾?é?¢ç·?ä½¿ç?¨(_M)"
-
-#: ../calendar/gui/calendar-component.c:633
-#: ../calendar/gui/memos-component.c:484
-#: ../calendar/gui/tasks-component.c:477
-msgid "_Do not make available for offline use"
-msgstr "ä¸?å??è¨±æ¤é ?å?¨é?¢ç·?ç??æ??ä½¿ç?¨(_D)"
-
-#: ../calendar/gui/calendar-component.c:961
-msgid "Failed upgrading calendars."
-msgstr "å??ç´?è¡?äº?æ??å¤±æ??ã??"
-
-#: ../calendar/gui/calendar-component.c:1089
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s' ä¾?å»ºç«?äº?ä»¶å??æ??è°"
-
-#: ../calendar/gui/calendar-component.c:1105
-msgid "There is no calendar available for creating events and meetings"
-msgstr "æ²?æ??è¡?äº?æ??å?¯ç?¨ä¾?å»ºç«?äº?ä»¶å??æ??è°"
-
-#: ../calendar/gui/calendar-component.c:1218
-msgid "Calendar Source Selector"
-msgstr "è¡?äº?æ??ä¾?æº?é?¸æ??å?¨"
-
-#: ../calendar/gui/calendar-component.c:1433
-msgid "New appointment"
-msgstr "æ?°å¢?ç´?æ??"
-
-#: ../calendar/gui/calendar-component.c:1434
-msgctxt "New"
-msgid "_Appointment"
-msgstr "ç´?æ??(_A)"
-
-#: ../calendar/gui/calendar-component.c:1435
-msgid "Create a new appointment"
-msgstr "å»ºç«?ä¸?å??æ?°ç??ç´?æ??"
-
-#: ../calendar/gui/calendar-component.c:1441
-msgid "New meeting"
-msgstr "æ?°å¢?æ??è°"
-
-#: ../calendar/gui/calendar-component.c:1442
-msgctxt "New"
-msgid "M_eeting"
-msgstr "æ??è°(_E)"
-
-#: ../calendar/gui/calendar-component.c:1443
-msgid "Create a new meeting request"
-msgstr "å»ºç«?æ?°æ??è°è¦?æ±?"
-
-#: ../calendar/gui/calendar-component.c:1449
-msgid "New all day appointment"
-msgstr "æ?°ç??å?¨æ?¥ç´?æ??"
-
-#: ../calendar/gui/calendar-component.c:1450
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "å?¨æ?¥ç´?æ??(_P)"
-
-#: ../calendar/gui/calendar-component.c:1451
-msgid "Create a new all-day appointment"
-msgstr "å»ºç«?æ?°ç??å?¨æ?¥ç´?æ??"
-
-#: ../calendar/gui/calendar-component.c:1457
-msgid "New calendar"
-msgstr "æ?°è¡?äº?æ??"
-
-#: ../calendar/gui/calendar-component.c:1458
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "è¡?äº?æ??(_N)"
-
-#: ../calendar/gui/calendar-component.c:1459
-msgid "Create a new calendar"
-msgstr "å»ºç«?æ?°è¡?äº?æ??"
-
 #: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "æ?¥æª¢è¦?"
@@ -4055,18 +2937,15 @@ msgstr "é?±æª¢è¦?"
 msgid "Month View"
 msgstr "æ??æª¢è¦?"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "ä»»ä½?æ¬?ä½?"
 
-#: ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
-msgstr "é??å? æª?æ¡?"
+msgstr "é??ä»¶"
 
 #: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -4074,613 +2953,554 @@ msgstr "é??å? æª?æ¡?"
 msgid "Attendee"
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/caltypes.xml.h:5
-#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "æ¸é¡?"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:370
-#: ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-task-table.c:500
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../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/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°:"
 
-#: ../calendar/gui/caltypes.xml.h:9
-#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-#: ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "ä¸?å?å?¨"
 
-#: ../calendar/gui/caltypes.xml.h:11
-#: ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "å?å?¨"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:722
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../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:368
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "æ??è°å?¬é??äºº"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:368
-#: ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-task-table.c:499
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ç§?äºº"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:359
-#: ../calendar/gui/e-cal-model.c:366
-#: ../calendar/gui/e-calendar-table.c:563
-#: ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
+#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../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-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:354
 msgid "Summary"
 msgstr "æ??è¦?"
 
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "æ??è¦?å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25
-#: ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26
-#: ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "ä¸?å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27
-#: ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "æ?¯"
 
-#: ../calendar/gui/caltypes.xml.h:22
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ä¸?æ?¯"
 
-#: ../calendar/gui/comp-editor-factory.c:408
-msgid "Error while opening the calendar"
-msgstr "é??å??è¡?äº?æ??æ??ç?¼ç??é?¯èª¤"
-
-#: ../calendar/gui/comp-editor-factory.c:414
-msgid "Method not supported when opening the calendar"
-msgstr "é??å??è¡?äº?æ??æ??ä¸?æ?¯æ?´æ?¹æ³?"
-
-#: ../calendar/gui/comp-editor-factory.c:420
-msgid "Permission denied to open the calendar"
-msgstr "æ²?æ??é??å??è¡?äº?æ??ç??æ¬?é??"
-
-#: ../calendar/gui/comp-editor-factory.c:438
-#: ../shell/e-shell.c:1261
-msgid "Unknown error"
-msgstr "ä¸?æ??ç??é?¯èª¤"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:611
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "ç·¨è¼¯é¬§é?´"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "é¡¯ç¤ºæ??ç¤º"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "æ?æ?¾é?³æ??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "å?·è¡?å¤?é?¨ç¨?å¼?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "å?³é??é?»å?é?µä»¶"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>é¬§é?´</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>é?¸é ?</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>é??è¤?</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "æ?°å¢?é¬§é?´"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Alarm"
+msgstr "é¬§é?´"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "è?ªé?¸è¨?æ?¯(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "è?ªé?¸é¬§é?´è?²é?³"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "è¨?æ?¯(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+msgid "Options"
+msgstr "é?¸é ?"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "é??è¤?"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "è«?é?¸å??æª?æ¡?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "æ?¶ä»¶è??ï¼?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "å¼?æ?¸(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "å?·è¡?ç¨?å¼?(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "é??è¤?é¬§é?´(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "è?²é?³(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-msgid ""
-"before\n"
-"after"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#, fuzzy
+msgid "after"
+msgstr "ä¹?å¾?(_A):"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#, fuzzy
+msgid "before"
 msgstr ""
 "ä¹?å??\n"
 "ä¹?å¾?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+msgid "day(s)"
+msgstr "å¤©"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../filter/filter.ui.h:14
+#: ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/caldav/caldav-source.c:497
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:518
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "days"
+msgstr "å¤©"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+msgid "end of appointment"
+msgstr "ç´?æ??çµ?æ??"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "æ??é??é??é??æ¯?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-msgid ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
-msgstr ""
-"å??é??\n"
-"å°?æ??\n"
-"æ?¥"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+msgid "hour(s)"
+msgstr "å°?æ??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-msgid ""
-"minutes\n"
-"hours\n"
-"days"
-msgstr ""
-"å??é??\n"
-"å°?æ??\n"
-"æ?¥"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "minute(s)"
+msgstr "å??é??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid ""
-"start of appointment\n"
-"end of appointment"
-msgstr ""
-"ç´?æ??é??å§?\n"
-"ç´?æ??çµ?æ??"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "start of appointment"
+msgstr "ç´?æ??é??å§?"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "å??ä½?/è§¸ç?¼"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "å? å?¥(_A)"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../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
 msgid "Alarms"
 msgstr "é¬§é?´"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
-msgid "_Suggest automatic display of attachment"
-msgstr "å»ºè°è?ªå??é¡¯ç¤ºé??ä»¶(_S)"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
-msgid "Attach file(s)"
-msgstr "é??å? æª?æ¡?"
-
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/event-page.c:2993
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-day-view-time-item.c:785
-#: ../calendar/gui/e-itip-control.c:1150
-#: ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:717
-#: ../mail/em-account-editor.c:1451
-#: ../mail/em-account-prefs.c:435
-#: ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:394
-#: ../plugins/exchange-operations/exchange-delegates-user.c:179
-#: ../plugins/itip-formatter/itip-formatter.c:2208
-#: ../widgets/misc/e-cell-date-edit.c:312
-#: ../widgets/misc/e-dateedit.c:1463
-#: ../widgets/misc/e-dateedit.c:1674
-#: ../widgets/misc/e-signature-combo-box.c:74
+#. 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/e-day-view-time-item.c:797
+msgctxt "cal-second-zone"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
+#: ../calendar/gui/e-timezone-entry.c:319
+msgid "Select..."
+msgstr "é?¸æ??..."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
 msgid "Selected Calendars for Alarms"
 msgstr "é?¸æ??é¬§é?´è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
 msgid "Time and date:"
 msgstr "æ??å?»å??æ?¥æ??ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
 msgid "Date only:"
 msgstr "å?ªæ??æ?¥æ??ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u è?? %d æ??è¢«æ?¿æ??ç?ºé?»å?é?µä»¶ä½?å??ä¸ç??ä½¿ç?¨è??è??ç¶²å??å??ç¨±ã??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
 msgstr "(é¡¯ç¤ºæ?¼æ?¥æª¢è¦?)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 å??é??\n"
-"30 å??é??\n"
-"15 å??é??\n"
-"10 å??é??\n"
-"05 å??é??"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+msgid "05 minutes"
+msgstr "05 å??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u è?? %d æ??è¢«æ?¿æ??ç?ºé?»å?é?µä»¶ä½?å??ä¸ç??ä½¿ç?¨è??è??ç¶²å??å??ç¨±ã??</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<span weight=\"bold\">Alarms</span>"
-msgstr "<span weight=\"bold\">é¬§é?´</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">è¦å??</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Date/Time Format</span>"
-msgstr "<span weight=\"bold\">æ?¥æ??/æ??é??æ ¼å¼?</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">é ?è¨ç©ºé??/å¿?ç¢?ä¼ºæ??å?¨</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">ä¸?è?¬</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">å·¥ä½?æ¸?å?®</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">æ??é??</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">å·¥ä½?é?±</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+msgid "10 minutes"
+msgstr "10 å??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+msgid "15 minutes"
+msgstr "15 å??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+msgid "30 minutes"
+msgstr "30 å??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+msgid "60 minutes"
+msgstr "60 å??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+msgid "Alerts"
+msgstr "è¦ç¤º"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "æ?¥æ??/æ??å?»æ ¼å¼?"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "ä¸?æ?¥çµ?æ??æ?¼(_E):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+msgid "Days"
+msgstr "å¤©"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "é ?è¨ç??ç©ºé??/å¿?ç¢?ä¼ºæ??å?¨ç¶²å??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "é¡¯ç¤º"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
 msgid "Display alarms in _notification area only"
 msgstr "å?ªå?¨é??ç?¥å??å??ä¸é¡¯ç¤ºé¬§é?´(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"å??é??\n"
-"å°?æ??\n"
-"æ?¥"
+#: ../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:2653
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "General"
+msgstr "ä¸?è?¬"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+msgid "Hours"
+msgstr "å°?æ??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+msgid "Minutes"
+msgstr "å??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"æ??æ??ä¸?\n"
-"æ??æ??äº?\n"
-"æ??æ??ä¸?\n"
-"æ??æ??å??\n"
-"æ??æ??äº?\n"
-"æ??æ??å?\n"
-"æ??æ??æ?¥"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:118
+#. 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:745 ../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
 msgid "Pick a color"
 msgstr "æ??é?¸é¡?è?²"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "é?±æ?¥(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "æ??æ??å?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "ä»¥é?±æ?²å??æ??æª¢è¦?(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "ç¬¬äº?æ??å??(_C):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "é?¸æ??é¬§é?´é??ç?¥ç??è¡?äº?æ??"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
 msgstr "é¡¯ç¤ºæ??é??æ?¼ç´?æ??(_O)"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
 msgstr "é¡¯ç¤ºæ??é??(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "å?¨æ?¥æ??å°?è¦½é¡¯ç¤ºé?±æ?¸(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../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.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "T_asks due today:"
 msgstr "ä»?å¤©å?°æ??ç??å·¥ä½?(_A):"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
 msgstr "é?±å??(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "å·¥ä½?æ¸?å?®"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "Template:"
 msgstr "æ¨£æ?¿:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:613
+msgid "Time"
+msgstr "æ??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "æ??å??(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "æ??å?»æ ¼å¼?:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Use s_ystem time zone"
 msgstr "ä½¿ç?¨ç³»çµ±æ??å??(_Y)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
 msgstr "ä¸?é?±é??å§?æ?¼(_K):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+msgid "Work Week"
+msgstr "å·¥ä½?é?±"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Work days:"
 msgstr "å·¥ä½?æ?¥:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 å°?æ?? (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "_24 hour"
 msgstr "_24 å°?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??ç¢ºèª?(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_Compress weekends in month view"
 msgstr "å?¨æ??æª¢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
 msgstr "ä¸?æ?¥é??å§?æ?¼(_D):"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
 msgstr "é?±äº?(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Hide completed tasks after"
 msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?(_H)"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
 msgstr "é?±ä¸?(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
 msgstr "é??æ??ç??å·¥ä½?(_O):"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
 msgstr "é?±å?(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "å?¨é?±å??æ??ç??æª¢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
 msgstr "æ??é??é??é??(_T):"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
 msgstr "é?±äº?(_T)"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
 msgstr "é?±ä¸?(_W)"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
 msgstr "å?¨æ¯?å??é?±å¹´ç´?å¿µæ?¥/ç??æ?¥ä¹?å??"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "before every appointment"
 msgstr "å??"
 
@@ -4688,6 +3508,19 @@ msgstr "å??"
 msgid "Type:"
 msgstr "é¡?å??:"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:500
+msgid "_Type:"
+msgstr "é¡?å??(_T):"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../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
+msgid "_Name:"
+msgstr "å??ç¨±(_N):"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "è¤?è£½è¡?äº?æ??å?§å®¹è?³æ?¬å?°ä»¥ä¾¿é?¢ç·?ä½?æ¥(_Y)"
@@ -4704,10 +3537,6 @@ msgstr "è¤?è£½å??å¿?é??æ¸?å?®å?§å®¹è?³æ?¬å?°ä»¥ä¾¿é?¢ç·?ä½?æ¥(_Y)"
 msgid "Colo_r:"
 msgstr "é¡?è?²(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "å·¥ä½?æ¸?å?®"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "å??å¿?é??æ¸?å?®"
@@ -4785,248 +3614,251 @@ msgstr "%s  ä½ æ²?æ??å??ä»»ä½?æ?´æ?¹ï¼?æ?´æ?°é??å??ç·¨è¼¯å?¨ï¼?"
 msgid "Validation error: %s"
 msgstr "ç¢ºèª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189
-#: ../calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2380
 msgid " to "
 msgstr " å?° "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2384
 msgid " (Completed "
 msgstr " (å·²å®?æ??) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195
-#: ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2386
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2391
 msgid " (Due "
 msgstr "(æ??é??)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202
-#: ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2393
 msgid "Due "
 msgstr "æ??é?? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:224
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "ç?¡æ³?å?²å?é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:509
 msgid "Could not update object"
 msgstr "ç?¡æ³?æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "ç·¨è¼¯ç´?æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "æ??è° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:591
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "ç´?æ?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:597
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "æ??æ´¾ç??å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:599
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "å??å¿?é?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "æ²?æ??æ??è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "æ?¯å?¦ä¿?æ??å??å§?é ?ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "æ??é??è£?ä»¥é??é??ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
-msgid "Copy selected text to the clipboard"
-msgstr "è¤?è£½é?¸å??ç??æ??å?è?³å?ªè²¼ç°¿"
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1444
+#: ../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
+msgid "Copy the selection"
+msgstr "è¤?è£½é?¸å??ç??å?§å®¹"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1451
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:959
+msgid "Cut the selection"
+msgstr "å?ªä¸?é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:982
-msgid "Cut selected text to the clipboard"
-msgstr "å?ªä¸?é?¸å??ç??æ??å?è?³å?ªè²¼ç°¿"
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1458
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+msgid "Delete the selection"
+msgstr "å?ªé?¤é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:989
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "æ??é??è£?ä»¥æª¢è¦?å?¯ç?¨ç??èªªæ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:996
-msgid "Paste text from the clipboard"
-msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?æ??å?"
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1493
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:971
+msgid "Paste the clipboard"
+msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1017
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "æ??é??è£?ä»¥å?²å?ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1024
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1563
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "é?¸å??æ??æ??æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1031
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "æ¸é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1045
-#: ../mail/mail-signature-editor.c:209
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1612
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "æª?æ¡?(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1052
-#: ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1043
 msgid "_Options"
 msgstr "é?¸é ?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
-#: ../mail/em-folder-tree.c:2106
-#: ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1654
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "é??ä»¶(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
-msgstr "æ??é??è£?ä»¥é??å? æª?æ¡?"
+msgstr "æ??é??è£?ä»¥é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "å??é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å??é¡?ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "æ??å??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??æ??å??ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "å?¬é??(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "å??é¡?ç?ºå?¬é??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "ç§?äºº(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "æ¸é¡?ç?ºç§?äºº"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "æ©?å¯?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "æ¸é¡?ç?ºæ©?å¯?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "è§?è?²æ¬?ä½?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??è§?è?²ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??RSVPã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "ç??æ??æ¬?ä½?(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??ç??æ??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "é¡?å??æ¬?ä½?(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å?°æ??è??é¡?å??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
-#: ../composer/e-composer-private.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "æ??è¿?ä½¿ç?¨æ??ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../composer/e-composer-actions.c:518
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "é??å? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "å?²å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1924
-#: ../calendar/gui/dialogs/comp-editor.c:1973
-#: ../calendar/gui/dialogs/comp-editor.c:2833
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2955
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ??æ?°ç??æ?´æ?°ï¼?å??æ??æ?¾æ£?å°?æ¤é ?ç?®æ??å??ç??æ?´æ?¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2801
-#: ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2862
+#: ../calendar/gui/dialogs/comp-editor.c:2985
 msgid "Unable to use current version!"
 msgstr "ç?¡æ³?ä½¿ç?¨ç?®å??ç??ç??æ?¬ï¼?"
 
@@ -5042,7 +3874,7 @@ msgstr "ç?¡æ³?é??å??ç?®ç??å?°"
 msgid "Destination is read only"
 msgstr "ç?®ç??å?°æ?¯å?¯è®?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "æ?¯å?¦å?ªé?¤å?¶ä»?æ??æ??æ?¶ä»¶è??ä¿¡ç®±ä¸ç??é??å??é ?ç?®(_D)ï¼?"
 
@@ -5094,159 +3926,145 @@ msgstr "ç?±æ?¼é?¯èª¤ï¼?æ??ä»¥ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
 msgid "The item could not be deleted due to an error"
 msgstr "ç?±æ?¼é?¯èª¤ï¼?æ??ä»¥ç?¡æ³?å?ªé?¤é ?ç?®ã??"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "è?¯çµ¡äºº..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:416
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "å§?è¨?çµ¦ï¼?"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "è¼¸å?¥ä»£è¡¨"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Alarms"
 msgstr "é¬§é?´(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Click here to set or unset alarms for this event"
 msgstr "æ??é??è£?ä»¥è¨å®?æ??å??æ¶?é??å??äº?ä»¶ç??é¬§é?´"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 msgid "_Recurrence"
 msgstr "é?±æ??æ?§(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "Make this a recurring event"
 msgstr "å°?æ¤é ?è¨ç?ºå¾ªç?°äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "æ??å?¥é?²é??å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
 msgstr "å?¨å¤©äº?ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Toggles whether to have All Day Event"
 msgstr "å??æ??æ?¯å?¦è¦?æ??å?¨å¤©äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Show Time as _Busy"
 msgstr "é¡¯ç¤ºæ??é??ç?ºå¿?ç¢?(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Toggles whether to show time as busy"
 msgstr "å??æ??æ?¯å?¦å°?æ??é??é¡¯ç¤ºç?ºå¿?ç¢?"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "_Free/Busy"
 msgstr "ç©ºé??/å¿?ç¢?(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:246
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è©¢æ¤å?°æ??è??ç??ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:291
 msgid "Appoint_ment"
 msgstr "ç´?æ??(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:748
+#: ../calendar/gui/dialogs/event-page.c:751
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ä¸?è?½ç·¨è¼¯äº?ä»¶ï¼?å? ç?ºé?¸å??ç??è¡?äº?æ??æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/event-page.c:752
+#: ../calendar/gui/dialogs/event-page.c:755
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯äº?ä»¶ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??äºº"
 
-#: ../calendar/gui/dialogs/event-page.c:764
-#: ../calendar/gui/dialogs/event-page.c:2769
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "é??å??äº?ä»¶å?·æ??é¬§é?´"
 
-#: ../calendar/gui/dialogs/event-page.c:827
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æ??è°å?¬é??äºº(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "ä»£ç??è??(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "å?°æ??è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1062
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "ç?¡é??å§?æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1065
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "ç?¡çµ?æ??æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
-#: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "é??å§?æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1246
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "çµ?æ??æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "é??å§?æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1276
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "çµ?æ??æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1438
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "é?¸å??ç??å?¬é??äººå·²ç¶?æ²?æ??å¸³è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1444
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??å?¬é??äººã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1469
-#: ../calendar/gui/dialogs/task-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "æ??å°?é??è¦?ä¸?å??å?°æ??è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1912
-#: ../calendar/gui/dialogs/task-page.c:1219
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "ç§»é?¤(_R)"
-
-#: ../calendar/gui/dialogs/event-page.c:1913
-#: ../calendar/gui/dialogs/task-page.c:1220
-msgid "_Add "
-msgstr "æ?°å¢?(_A)"
-
-#: ../calendar/gui/dialogs/event-page.c:2639
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
@@ -5257,156 +4075,147 @@ 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:2683
-#: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1825
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ä½ æ£æ??ä»» %s ç??ä»£ç??äºº"
 
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 msgstr[1] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 
-#: ../calendar/gui/dialogs/event-page.c:2973
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ç´?æ??å?? %d å°?æ??"
 msgstr[1] "ç´?æ??å?? %d å°?æ??"
 
-#: ../calendar/gui/dialogs/event-page.c:2979
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ç´?æ??å?? %d å??é??"
 msgstr[1] "ç´?æ??å?? %d å??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:2992
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "è?ªé?¸"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
-"ç´?æ??å?? 15 å??é??\n"
-"ç´?æ??å?? 1 å°?æ??\n"
-"ç´?æ??å?? 1 å¤©"
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2964
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+msgid "1 day before appointment"
+msgstr "ç´?æ??å?? 1 å¤©"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgid "1 hour before appointment"
+msgstr "ç´?æ??å?? 1 å°?æ??"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+msgid "15 minutes before appointment"
+msgstr "ç´?æ??å?? 15 å??é??"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 msgid "Attendee_s..."
 msgstr "å?°æ??è??(_S)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "è?ªé?¸é¬§é?´:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "äº?ä»¶æ??è¿°"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../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.glade.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
 msgstr "é¬§é?´(_A)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:364
 msgid "_Location:"
 msgstr "ä½?ç½®(_L):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "æ??å?»(_T):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:192
-#: ../mail/mail-dialogs.glade.h:21
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
-#: ../smime/gui/smime-ui.glade.h:49
-msgid ""
-"a\n"
-"b"
-msgstr ""
-"a\n"
-"b"
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#, fuzzy
+msgid "for"
+msgstr "æ??å°?(_F):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid ""
-"for\n"
-"until"
-msgstr ""
-"æ?¼\n"
-"ç?´å?°"
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#, fuzzy
+msgid "until"
+msgstr "å?®ä½?(_U):"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111
-#: ../calendar/gui/print.c:2469
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2529
 msgid "Memo"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-page.c:347
+#: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºé?¸å??ç??å??å¿?é??æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/memo-page.c:351
+#: ../calendar/gui/dialogs/memo-page.c:354
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??äºº"
 
-#: ../calendar/gui/dialogs/memo-page.c:871
+#: ../calendar/gui/dialogs/memo-page.c:875
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1031
-#: ../mail/em-format-html.c:1566
-#: ../mail/em-format-html.c:1624
-#: ../mail/em-format-html.c:1649
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:925
-#: ../mail/em-mailer-prefs.c:78
-#: ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:224
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
+#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "æ?¶ä»¶è??"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "é??å§?æ?¥(_R):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "æ?¶ä»¶è??(_O):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:380
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "ç¾£çµ?(_G):"
 
@@ -5446,21 +4255,21 @@ msgstr "æ¤ä¾?é ?å??ä»¥å¾?ç??ä¾?é ?"
 msgid "All Instances"
 msgstr "æ??æ??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution ç?¡æ³?ç·¨è¼¯é??å??é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:889
 msgid "Recurrence date is invalid"
 msgstr "é?±æ??æ?§æ?¥æ??ç?¡æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 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:961
+#: ../calendar/gui/dialogs/recurrence-page.c:958
 msgid "on"
 msgstr "ç??"
 
@@ -5468,7 +4277,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:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "first"
 msgstr "ä¸?"
 
@@ -5477,7 +4286,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1021
 msgid "second"
 msgstr "äº?"
 
@@ -5485,7 +4294,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:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "third"
 msgstr "ä¸?"
 
@@ -5493,7 +4302,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:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "fourth"
 msgstr "å??"
 
@@ -5501,7 +4310,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:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "fifth"
 msgstr "ç¬¬äº?"
 
@@ -5509,13 +4318,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:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 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:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1065
 msgid "Other Date"
 msgstr "å?¶å®?æ?¥æ??"
 
@@ -5523,7 +4332,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:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "1st to 10th"
 msgstr "1æ?¥è?³10æ?¥"
 
@@ -5531,7 +4340,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:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "11th to 20th"
 msgstr "11æ?¥è?³20æ?¥"
 
@@ -5539,96 +4348,79 @@ 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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 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:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "day"
 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:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1237
 msgid "on the"
 msgstr "å?¨ç¬¬"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1410
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "æ¬¡"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2105
+#: ../calendar/gui/dialogs/recurrence-page.c:2117
 msgid "Add exception"
 msgstr "å? å?¥ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2146
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Could not get a selection to modify."
 msgstr "ç?¡æ³?å??å¾?è¦?ç·¨è¼¯ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2152
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Modify exception"
 msgstr "ç·¨è¼¯ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2196
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
 msgid "Could not get a selection to delete."
 msgstr "ç?¡æ³?å??å¾?è¦?å?ªé?¤ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2320
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ??é??"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>ä¾?å¤?</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
-msgid "<b>Preview</b>"
-msgstr "<b>é ?è¦½</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>é?±æ??</b>"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 msgid "Every"
 msgstr "æ¯?"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "ä¾?å¤?"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+msgid "Preview"
+msgstr "é ?è¦½"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 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.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
-"å¤©\n"
-"é?±\n"
-"æ??\n"
-"å¹´"
-
-#. 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.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
-msgstr ""
-"æ?¼\n"
-"ç?´å?°\n"
-"æ°¸é? "
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+msgid "forever"
+msgstr "æ°¸é? "
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgid "month(s)"
+msgstr "å??æ??"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgid "week(s)"
+msgstr "é?±"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+msgid "year(s)"
+msgstr "å¹´"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
@@ -5638,86 +4430,132 @@ msgstr "å°?æ??ç??é¬§é?´è??é??å??äº?ä»¶ä¸?èµ·é??å?º"
 msgid "Notify new attendees _only"
 msgstr "å?ªé??ç?¥æ?°ç??å?°æ??è??(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:376
-#: ../calendar/gui/dialogs/task-details-page.c:396
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??é?¯èª¤ "
 
-#: ../calendar/gui/dialogs/task-details-page.c:481
+#: ../calendar/gui/dialogs/task-details-page.c:485
 msgid "Web Page"
 msgstr "ç¶²é ?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">é??é ?</span>"
+#. 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:221
+#: ../calendar/gui/e-task-table.c:236 ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/print.c:2605 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:358
+msgid "Completed"
+msgstr "å·²å®?æ??"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+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:219
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:2602
+msgid "In Progress"
+msgstr "é?²è¡?ä¸"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">ç??æ??</span>"
+#. 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:522 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+msgid "Low"
+msgstr "ä½?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
-"é«?\n"
-"ä¸\n"
-"ä½?\n"
-"æ?ªå®?ç¾©"
+#. 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:1280 ../calendar/gui/e-task-table.c:521
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../widgets/misc/e-send-options.ui.h:13
+msgid "Normal"
+msgstr "ä¸?è?¬"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
-"å°?æ?ªé??å§?\n"
-"é?²è¡?ä¸\n"
-"å·²å®?æ??\n"
-"å·²å??æ¶?"
+#. 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:217
+#: ../calendar/gui/e-task-table.c:232 ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:2599 ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "æ?ªé??å§?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "å®?æ??ç?¾å??æ¯?(_E):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "ç??æ??(_U):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. 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-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "ç??æ??"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:523 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Undefined"
+msgstr "æ?ªæ??å®?"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "å®?æ??æ?¥æ??(_D):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Priority:"
 msgstr "å?ªå??é ?åº?(_P):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "ç¶²é ?(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "ç??æ??è©³ç´°è³?æ??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "æ??é??è£?æ?¹è®?/æª¢è¦?è©²å·¥ä½?ç??ç??æ??è©³ç´°è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:371
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:198
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "_Task"
 msgstr "å·¥ä½?(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:337
 msgid "Task Details"
 msgstr "å·¥ä½?è©³ç´°è³?æ??"
 
@@ -5730,32 +4568,32 @@ 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.glade.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "æ??è°å?¬é??äºº(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:803
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥é?¯èª¤"
 
-#: ../calendar/gui/dialogs/task-page.c:1782
+#: ../calendar/gui/dialogs/task-page.c:1700
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "ç?¡æ³?å?¨ '%s' é??å??å·¥ä½?ã??"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
 msgid "Atte_ndees..."
 msgstr "å?°æ??è??(_N)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "å??é¡?(_I)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "å?°æ??æ?¥(_U):"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "æ??å??:"
 
@@ -5835,143 +4673,53 @@ msgstr "%s å?¨ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ç?ºæ?ªç?¥ç??è§¸ç?¼é¡?å??"
 
-#: ../calendar/gui/e-attachment-handler-calendar.c:258
-msgid "I_mport"
-msgstr "å?¯å?¥(_M)"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:340
-msgid "Select a Calendar"
-msgstr "é?¸æ??è¡?äº?æ??"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:367
-msgid "Select a Task List"
-msgstr "é?¸æ??å·¥ä½?æ¸?å?®"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:377
-msgid "I_mport to Calendar"
-msgstr "å?¯å?¥è?³è¡?äº?æ??(_M)"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:384
-msgid "I_mport to Tasks"
-msgstr "å?¯å?¥è?³å·¥ä½?(_M)"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:68
-#: ../calendar/gui/e-cal-component-preview.c:67
-#: ../mail/em-folder-view.c:3210
-#, c-format
-msgid "Click to open %s"
-msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:127
-#: ../calendar/gui/e-cal-component-preview.c:170
-#: ../filter/filter-rule.c:859
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:658
 msgid "Untitled"
 msgstr "ç?¡æ¨?é¡?"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:178
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../calendar/gui/e-cal-component-preview.c:220
-msgid "Start Date:"
-msgstr "é??å§?æ?¥æ??ï¼?"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:191
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../mail/mail-config.glade.h:75
-msgid "Description:"
-msgstr "æ??è¿°:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:215
-#: ../calendar/gui/e-cal-component-preview.c:309
-msgid "Web Page:"
-msgstr "ç¶²é ?ï¼?"
+#: ../calendar/gui/e-cal-component-preview.c:198
+msgid "Categories:"
+msgstr "å??é¡?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:202
-#: ../calendar/gui/e-itip-control.c:1154
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "æ??è¦?:"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
+msgid "Start Date:"
+msgstr "é??å§?æ?¥æ??ï¼?"
+
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "æ?ªæ¢æ?¥æ??ï¼?"
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:238
-#: ../calendar/gui/e-itip-control.c:1178
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "ç??æ??:"
 
-#: ../calendar/gui/e-cal-component-preview.c:242
-#: ../calendar/gui/e-cal-model-tasks.c:359
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-cal-model-tasks.c:752
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:659
-#: ../calendar/gui/print.c:2542
-msgid "In Progress"
-msgstr "é?²è¡?ä¸"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-cal-model-tasks.c:361
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:660
-#: ../calendar/gui/e-itip-control.c:939
-#: ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/print.c:2545
-#: ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Completed"
-msgstr "å·²å®?æ??"
-
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model-tasks.c:357
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:658
-#: ../calendar/gui/print.c:2539
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "æ?ªé??å§?"
-
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "å?ªå??ç?ç´?:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
-#: ../calendar/gui/e-calendar-table.c:585
-#: ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1064
-msgid "High"
-msgstr "é«?"
-
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-cal-model.c:1076
-#: ../calendar/gui/e-calendar-table.c:586
-#: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/message-list.c:1063
-msgid "Normal"
-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
+msgid "Description:"
+msgstr "æ??è¿°:"
 
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-calendar-table.c:587
-#: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1062
-msgid "Low"
-msgstr "ä½?"
+#: ../calendar/gui/e-cal-component-preview.c:368
+msgid "Web Page:"
+msgstr "ç¶²é ?ï¼?"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Created"
 msgstr "å·²å»ºç«?"
 
@@ -5991,17 +4739,16 @@ msgid "Start Date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-task-table.c:572
 msgid "Free"
 msgstr "ç©ºé??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:638
-#: ../calendar/gui/e-meeting-time-sel.c:391
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:573
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
-#: ../calendar/gui/e-cal-model-tasks.c:625
+#: ../calendar/gui/e-cal-model-tasks.c:681
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6011,232 +4758,73 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027
-#: ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/e-meeting-store.c:742
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:731
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1286
+#: ../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:856
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027
-#: ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1286
+#: ../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
 msgid "No"
 msgstr "å?¦"
 
+#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
+#: ../shell/e-shell.c:836
+msgid "Shell Settings"
+msgstr "Shell è¨å®?å?¼"
+
+#: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
+#: ../shell/e-shell.c:837
+msgid "Application-wide settings"
+msgstr "æ??ç?¨ç¨?å¼?è¨å®?å?¼"
+
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:372
-#: ../calendar/gui/e-itip-control.c:1195
-#: ../calendar/gui/e-itip-control.c:1333
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:978
-#: ../calendar/gui/print.c:995
-#: ../mail/em-utils.c:1339
-#: ../plugins/itip-formatter/itip-formatter.c:449
-#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
+#: ../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:967
+#: ../calendar/gui/print.c:984 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
+#: ../plugins/itip-formatter/itip-formatter.c:461
+#: ../plugins/itip-formatter/itip-formatter.c:2325
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1078
+#: ../calendar/gui/e-cal-model.c:1282
 msgid "Recurring"
 msgstr "å¾ªç?°æ¨¡å¼?"
 
-#: ../calendar/gui/e-cal-model.c:1080
+#: ../calendar/gui/e-cal-model.c:1284
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-calendar-table.c:335
-msgid "* No Summary *"
-msgstr "* æ²?æ??æ??è¦? *"
-
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:371
-#: ../calendar/gui/e-calendar-view.c:2429
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "å?¬é??äºº: %s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2433
+#: ../calendar/gui/e-cal-model.c:2179 ../calendar/gui/gnome-cal.c:2028
 #, c-format
-msgid "Organizer: %s"
-msgstr "æ??è°å?¬é??äºº: %s"
-
-#: ../calendar/gui/e-calendar-table.c:405
-msgid "Start: "
-msgstr "é??å§?:"
-
-#: ../calendar/gui/e-calendar-table.c:417
-msgid "Due: "
-msgstr "å?°æ??:"
-
-#: ../calendar/gui/e-calendar-table.c:588
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "æ?ªæ??å®?"
-
-#: ../calendar/gui/e-calendar-table.c:607
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:608
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:609
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:610
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:611
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:612
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:613
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:614
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:615
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:616
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:617
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-calendar-table.c:897
-#: ../calendar/gui/e-calendar-view.c:659
-#: ../calendar/gui/e-memo-table.c:449
-msgid "Deleting selected objects"
-msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
-
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:873
-#: ../calendar/gui/e-memo-table.c:654
-msgid "Updating objects"
-msgstr "æ?´æ?°ç?©ä»¶"
-
-#: ../calendar/gui/e-calendar-table.c:1364
-#: ../calendar/gui/e-calendar-view.c:1333
-#: ../calendar/gui/e-memo-table.c:828
-#: ../composer/e-composer-actions.c:219
-msgid "Save as..."
-msgstr "å?¦å?æ?°æª?..."
-
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1789
-msgid "New _Task"
-msgstr "æ?°å¢?å·¥ä½?(_T)"
-
-#: ../calendar/gui/e-calendar-table.c:1592
-#: ../calendar/gui/e-memo-table.c:933
-msgid "Open _Web Page"
-msgstr "é??å??ç¶²é ?(_W)"
-
-#: ../calendar/gui/e-calendar-table.c:1593
-#: ../calendar/gui/e-calendar-view.c:1807
-#: ../calendar/gui/e-memo-table.c:934
-#: ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:494
-msgid "_Save As..."
-msgstr "å?¦å?æ?°æª?(_S)..."
-
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1792
-#: ../calendar/gui/e-memo-table.c:935
-msgid "P_rint..."
-msgstr "æ??å?°(_R)..."
-
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1812
-#: ../calendar/gui/e-memo-table.c:939
-#: ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1
-#: ../ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "å?ªä¸?(_U)"
-
-#: ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1795
-#: ../calendar/gui/e-calendar-view.c:1814
-#: ../calendar/gui/e-memo-table.c:941
-#: ../ui/evolution-addressbook.xml.h:57
-#: ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
-msgid "_Paste"
-msgstr "è²¼ä¸?(_P)"
-
-#: ../calendar/gui/e-calendar-table.c:1604
-#: ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "æ??æ´¾å·¥ä½?(_A)"
-
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-memo-table.c:945
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "ä»¥ iCale_ndar è½?å¯?"
-
-#: ../calendar/gui/e-calendar-table.c:1606
-msgid "_Mark as Complete"
-msgstr "æ¨?ç¤ºç?ºå®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1607
-msgid "_Mark Selected Tasks as Complete"
-msgstr "æ¨?ç¤ºé?¸å®?ç??å·¥ä½?ç?ºå·²å®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1608
-msgid "_Mark as Incomplete"
-msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1609
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "æ¨?ç¤ºé?¸å®?ç??å·¥ä½?ç?ºæ?ªå®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1614
-msgid "_Delete Selected Tasks"
-msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?(_D)"
-
-#: ../calendar/gui/e-calendar-table.c:1849
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "è«?æ??é??è£?å¢?å? æ?°ç??å·¥ä½?"
+msgid "Opening %s"
+msgstr "æ£å?¨é??å?? %s"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% å®?æ??"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "è«?æ??é??è£?å¢?å? æ?°ç??å·¥ä½?"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "å®?æ??"
@@ -6251,7 +4839,7 @@ msgstr "å?°æ??æ?¥"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Priority"
 msgstr "å?ªå??ç?ç´?"
 
@@ -6259,162 +4847,113 @@ msgstr "å?ªå??ç?ç´?"
 msgid "Start date"
 msgstr "é??å§?æ?¥æ??"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:2337
-#: ../calendar/gui/e-meeting-list-view.c:601
-#: ../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
-msgid "Status"
-msgstr "ç??æ??"
-
-#: ../calendar/gui/e-calendar-view.c:1478
-msgid "Moving items"
-msgstr "ç§»å??é ?ç?®"
-
-#: ../calendar/gui/e-calendar-view.c:1480
-msgid "Copying items"
-msgstr "è¤?è£½é ?ç?®"
-
-#: ../calendar/gui/e-calendar-view.c:1786
-msgid "New _Appointment..."
-msgstr "æ?°å¢?ç´?æ??(_A)..."
-
-#: ../calendar/gui/e-calendar-view.c:1787
-msgid "New All Day _Event"
-msgstr "æ?°å¢?å?¨å¤©äº?ä»¶(_E)"
-
-#: ../calendar/gui/e-calendar-view.c:1788
-msgid "New _Meeting"
-msgstr "æ?°å¢?æ??è°(_M)"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1799
-msgid "_Current View"
-msgstr "ç?®å??æª¢è¦?(_C)"
-
-#: ../calendar/gui/e-calendar-view.c:1801
-msgid "Select T_oday"
-msgstr "é?¸æ??ä»?å¤©(_O)"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-msgid "_Select Date..."
-msgstr "é?¸æ??æ?¥æ??(_S)..."
-
-#: ../calendar/gui/e-calendar-view.c:1808
-msgid "Pri_nt..."
-msgstr "æ??å?°(_N)..."
-
-#: ../calendar/gui/e-calendar-view.c:1818
-msgid "Cop_y to Calendar..."
-msgstr "è¤?è£½è?³è¡?äº?æ??(_Y)..."
-
-#: ../calendar/gui/e-calendar-view.c:1819
-msgid "Mo_ve to Calendar..."
-msgstr "ç§»è?³è¡?äº?æ??(_V)..."
-
-#: ../calendar/gui/e-calendar-view.c:1820
-msgid "_Delegate Meeting..."
-msgstr "å§?æ´¾æ??è°(_D)..."
-
-#: ../calendar/gui/e-calendar-view.c:1821
-msgid "_Schedule Meeting..."
-msgstr "æ??è°æ??ç¨?(_S)..."
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../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
+msgid "Type"
+msgstr "é¡?å??"
 
-#: ../calendar/gui/e-calendar-view.c:1822
-msgid "_Forward as iCalendar..."
-msgstr "ä»¥ iCale_ndar è½?å¯?..."
+#: ../calendar/gui/e-calendar-view.c:392
+msgid "Cut selected events to the clipboard"
+msgstr "å?ªä¸?é?¸å??ç??äº?ä»¶è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:1823
-msgid "_Reply"
-msgstr "å??è¦?(_R)"
+#: ../calendar/gui/e-calendar-view.c:398
+msgid "Copy selected events to the clipboard"
+msgstr "è¤?è£½é?¸å??ç??äº?ä»¶è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:1824
-#: ../mail/e-attachment-handler-mail.c:140
-#: ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:499
-#: ../ui/evolution-mail-message.xml.h:78
-msgid "Reply to _All"
-msgstr "å??è¦?æ??æ??äºº(_A)"
+#: ../calendar/gui/e-calendar-view.c:404
+msgid "Paste events from the clipboard"
+msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:1829
-msgid "Make this Occurrence _Movable"
-msgstr "å°?é??å??äº?ä»¶æ¨?ç¤ºæ??å?¯ç§»å??(_M)"
+#: ../calendar/gui/e-calendar-view.c:410
+msgid "Delete selected events"
+msgstr "å?ªé?¤é?¸å??ç??äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:1830
-#: ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "å?ªé?¤é??å??äº?ä»¶(_O)"
+#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:195
+#: ../calendar/gui/e-task-table.c:273
+msgid "Deleting selected objects"
+msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:1831
-msgid "Delete _All Occurrences"
-msgstr "å?ªé?¤å?¨é?¨äº?ä»¶(_A)"
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:854
+#: ../calendar/gui/e-task-table.c:1075
+msgid "Updating objects"
+msgstr "æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:2284
-#: ../calendar/gui/e-itip-control.c:1183
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-itip-control.c:1182
+#: ../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:2313
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:2285
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../plugins/itip-formatter/itip-formatter.c:2227
+#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../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:2319
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:2286
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/e-meeting-time-sel.c:390
+#: ../calendar/gui/e-calendar-view.c:1692
+#: ../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
 msgid "Tentative"
 msgstr "æ?«è¨?"
 
-#: ../calendar/gui/e-calendar-view.c:2287
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:200
-#: ../plugins/itip-formatter/itip-formatter.c:2230
+#: ../calendar/gui/e-calendar-view.c:1693
+#: ../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:2322
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
 
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:1694
 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:539
+#: ../calendar/gui/e-task-table.c:750
+#, 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:544
+#: ../calendar/gui/e-task-table.c:753
+#, c-format
+msgid "Organizer: %s"
+msgstr "æ??è°å?¬é??äºº: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2449
-#: ../calendar/gui/print.c:2501
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2561
 #, c-format
 msgid "Location: %s"
 msgstr "ä½?ç½®ï¼?%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2480
+#: ../calendar/gui/e-calendar-view.c:1886
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ??å?»: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:102
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:105
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:113
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6427,12 +4966,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:747
+#: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "é??é?? %02i å??é??"
 
-#: ../calendar/gui/e-day-view-time-item.c:768
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "é¡¯ç¤ºç¬¬äº?æ??å??"
 
@@ -6442,52 +4981,73 @@ 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:840
-#: ../calendar/gui/e-day-view.c:1576
-#: ../calendar/gui/e-week-view-main-item.c:359
-#: ../calendar/gui/print.c:1666
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1698
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:913
+msgid "%a %d %b"
+msgstr "%-m æ?? %-d æ?¥ (%a)"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:949
+msgid "%d %b"
+msgstr "%-m æ?? %-d æ?¥"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805
-#: ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:825
+#: ../calendar/gui/e-day-view.c:1120 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/print.c:814
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808
-#: ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:827
+#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/print.c:816
 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:2309
+#: ../calendar/gui/e-day-view.c:2614
 #, c-format
 msgid "Week %d"
 msgstr "ç¬¬ %d é?±"
 
-#: ../calendar/gui/e-itip-control.c:758
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "æ?¯ã??(è¤?é??å¾ªç?°)"
 
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "æ¯?å¤©"
 msgstr[1] "æ¯? %d å¤©"
 
-#: ../calendar/gui/e-itip-control.c:788
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "æ¯?é?±"
 msgstr[1] "æ¯? %d é?±"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6495,35 +5055,35 @@ msgstr[0] "æ¯?é?±æ?¼"
 msgstr[1] "æ¯? %d é?±æ?¼"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " å?? "
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s æ?¥æ?¼ "
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s æ?¥æ?¼ "
 
-#: ../calendar/gui/e-itip-control.c:842
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "æ¯?æ??"
 msgstr[1] "æ¯? %d æ??"
 
-#: ../calendar/gui/e-itip-control.c:854
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "æ¯?å¹´"
 msgstr[1] "æ¯? %d å¹´"
 
-#: ../calendar/gui/e-itip-control.c:867
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -6531,453 +5091,445 @@ msgstr[0] "ç¸½å?± %d æ¬¡"
 msgstr[1] "ç¸½å?± %d æ¬¡"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:878
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr "ï¼?çµ?æ??æ?¼ "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:900
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "é??å§?"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:914
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "çµ?æ??"
 
-#: ../calendar/gui/e-itip-control.c:954
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Due"
 msgstr "æ?ªæ¢"
 
-#: ../calendar/gui/e-itip-control.c:995
-#: ../calendar/gui/e-itip-control.c:1052
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "iCalendar è³?è¨?"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1012
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "iCalendar é?¯èª¤"
 
-#: ../calendar/gui/e-itip-control.c:1084
-#: ../calendar/gui/e-itip-control.c:1100
-#: ../calendar/gui/e-itip-control.c:1111
-#: ../calendar/gui/e-itip-control.c:1128
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../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
 msgid "An unknown person"
 msgstr "ä¸?æ??äººå£«"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1135
-msgid "<br> Please review the following information, and then select an action from the menu below."
+#: ../calendar/gui/e-itip-control.c:1132
+msgid ""
+"<br> 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:2300
+msgctxt "cal-itip"
+msgid "None"
+msgstr "æ²?æ??"
+
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2224
+#: ../plugins/itip-formatter/itip-formatter.c:2316
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:1274
-msgid "The meeting has been canceled, however it could not be found in your calendars"
+#: ../calendar/gui/e-itip-control.c:1277
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
 msgstr "æ??è°å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨ä½ ç??è¡?äº?æ??ä¸æ?¾ä¸?å?°"
 
-#: ../calendar/gui/e-itip-control.c:1276
-msgid "The task has been canceled, however it could not be found in your task lists"
+#: ../calendar/gui/e-itip-control.c:1279
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr "å·¥ä½?å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨ä½ ç??å·¥ä½?æ¸?å?®ä¸æ?¾ä¸?å?°"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?æ??è°è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "æ??è°è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> é??è«? %s å?ºå¸æ¤æ¬¡æ??è°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> é??è«?ä½ å?ºå¸æ¤æ¬¡æ??è°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "æ??è°æ??æ¡?"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??æ??è°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "æ??è°æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??æ??è°è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "æ??è°æ?´æ?°è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> å·²ç¶?ç?è¦?äº?æ??è°è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "æ??è°ç?è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> å·²ç¶?æ¶?å??æ??è°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "æ??è°å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1401
-#: ../calendar/gui/e-itip-control.c:1478
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> å?³é??äº?ä¸?å??é?£ä»¥ç??è§£ç??è¨?æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "ä¸?æ£ç¢ºç??æ??è°è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1429
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?å·¥ä½?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "å·¥ä½?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> è¦?æ±? %s é?²è¡?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> è¦?æ±?ä½ é?²è¡?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "å·¥ä½?è¨?å??"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?é ?æ?¢å?ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "å·¥ä½?æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??å·¥ä½?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "å·¥ä½?æ?´æ?°è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> å·²ç¶?å??è¦?æ??æ´¾ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "å·¥ä½?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> å·²ç¶?å??æ¶?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "å·¥ä½?å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1479
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "ä¸?æ£ç¢ºç??å·¥ä½?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?ç©ºé??/å¿?ç¢?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1504
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> è«?æ±?ä½ ç??ç©ºé??/å¿?ç¢?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "ç©ºé??/å¿?ç¢?è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1516
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> å·²ç¶?ç?è¦?ç©ºé??/å¿?ç¢?è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "ç©ºé??/å¿?ç¢?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "ä¸?æ£ç¢ºç??ç©ºé??/å¿?ç¢?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1595
+#: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
 msgstr "é?µä»¶ä¼¼ä¹?æ²?æ??è¢«é?©ç?¶å?°çµ?æ??"
 
-#: ../calendar/gui/e-itip-control.c:1654
+#: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
 msgstr "é??å??é?µä»¶å?ªå??å?«ä¸?æ?¯æ?´ç??è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1687
+#: ../calendar/gui/e-itip-control.c:1690
 msgid "The attachment does not contain a valid calendar message"
 msgstr "é??ä»¶ä¸¦æ?ªå??å?«å??æ³?ç??è¡?äº?æ??è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1725
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "é??ä»¶æ²?æ??å?¯æª¢è¦?ç??è¡?äº?æ??é ?ç?®"
 
-#: ../calendar/gui/e-itip-control.c:1967
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "æ?´æ?°å®?æ??\n"
 
-#: ../calendar/gui/e-itip-control.c:2001
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ç?©ä»¶æ?¯ç?¡æ??ç??è??ä¸?ä¸?è?½æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2018
+#: ../calendar/gui/e-itip-control.c:2022
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "é??å??å??è¦?ä¸¦é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?ä»?å? å?¥ç?ºå?°æ??è??ï¼?"
 
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2040
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??ä½¿å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2060
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2067
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1408
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "å?°æ??è??ç??æ??ä¸?è?½æ?´æ?°ï¼?å? ç?ºé ?ç?®å·²ç¶?ä¸?å?å?¨"
 
-#: ../calendar/gui/e-itip-control.c:2098
-#: ../calendar/gui/e-itip-control.c:2155
+#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "é ?ç?®å?³é??ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2104
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr "ç?¡æ³?å?³é??é??å??é ?ç?®ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2281
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "é?¸æ??ä¸?å??å??ä½?:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2310
-#: ../calendar/gui/e-meeting-list-view.c:589
+#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2350
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:2374
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2375
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2376
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "æ??çµ?"
 
-#: ../calendar/gui/e-itip-control.c:2401
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "é??å?ºç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:2425
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "æ?´æ?°å??æ??ç??æ??"
 
-#: ../calendar/gui/e-itip-control.c:2449
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "é??å?ºæ??æ?°è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:2473
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1088
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--å?°--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "è¡?äº?æ??è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "æ?¥æ??:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "è¼?å?¥è¡?äº?æ??"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "è¼?å?¥è¡?äº?æ??..."
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
 msgstr "æ??è°å?¬é??äºº:"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "ä¼ºæ??å?¨è¨?æ?¯:"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "ä¸»å¸"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "å?ºå¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "å??å¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "è³?æº?"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:84
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:736
-#: ../calendar/gui/print.c:974
+#: ../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:850 ../calendar/gui/print.c:963
 msgid "Individual"
 msgstr "å??å?¥"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/print.c:975
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/print.c:964 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ç¾£çµ?"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:976
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/print.c:965
 msgid "Resource"
 msgstr "è³?æº?"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90
-#: ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:977
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/print.c:966
 msgid "Room"
 msgstr "æ??è°å®¤"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:991
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:980
 msgid "Chair"
 msgstr "ä¸»å¸"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:739
-#: ../calendar/gui/print.c:992
+#: ../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:853 ../calendar/gui/print.c:981
 msgid "Required Participant"
 msgstr "å?ºå¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:993
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/print.c:982
 msgid "Optional Participant"
 msgstr "å??å¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:994
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/print.c:983
 msgid "Non-Participant"
 msgstr "ç¼ºå¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../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: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:544
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/e-meeting-store.c:181
-#: ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 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:2083
+#: ../calendar/gui/e-meeting-time-sel.c:2284
 msgid "%A, %B %d, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
@@ -6986,7 +5538,7 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 #. 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:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2315
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -6996,67 +5548,67 @@ msgstr "%Y/%m/%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:392
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Out of Office"
 msgstr "ä¸?å?¨è¾¦å?¬å®¤"
 
-#: ../calendar/gui/e-meeting-time-sel.c:393
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "No Information"
 msgstr "æ²?æ??è³?è¨?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:408
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "A_ttendees..."
 msgstr "å?°æ??è??(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:429
+#: ../calendar/gui/e-meeting-time-sel.c:581
 msgid "O_ptions"
 msgstr "é?¸é ?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:598
 msgid "Show _only working hours"
 msgstr "å?ªé¡¯ç¤ºå·¥ä½?æ??é??(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:456
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "é¡¯ç¤ºç¸®å°?(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:623
 msgid "_Update free/busy"
 msgstr "æ?´æ?°ç©ºé??/å¿?ç¢?(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:504
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "è?ªå??é?¸æ??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:536
+#: ../calendar/gui/e-meeting-time-sel.c:688
 msgid "_All people and resources"
 msgstr "æ??æ??äººå?¡å??è³?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:697
 msgid "All _people and one resource"
 msgstr "æ??æ??äººå?¡å??ä¸?å??è³?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:554
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "_Required people"
 msgstr "å¿?è¦?ç??äººå?¡(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "Required people and _one resource"
 msgstr "å¿?è¦?äººå?¡å??ä¸?å??è³?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:760
 msgid "_Start time:"
 msgstr "é??å§?æ??å?»(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:626
+#: ../calendar/gui/e-meeting-time-sel.c:797
 msgid "_End time:"
 msgstr "çµ?æ??æ??å?»(_E):"
 
@@ -7084,171 +5636,383 @@ msgstr "èª?è¨?"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:950
-msgid "_Delete Selected Memos"
-msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??(_D)"
+#: ../calendar/gui/e-memo-table.c:423
+#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../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
+msgid "Memos"
+msgstr "å??å¿?é??"
+
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:714
+msgid "* No Summary *"
+msgstr "* æ²?æ??æ??è¦? *"
+
+#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:794
+msgid "Start: "
+msgstr "é??å§?:"
+
+#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:812
+msgid "Due: "
+msgstr "å?°æ??:"
+
+#: ../calendar/gui/e-memo-table.c:719
+msgid "Cut selected memos to the clipboard"
+msgstr "å?ªä¸?é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
+
+#: ../calendar/gui/e-memo-table.c:725
+msgid "Copy selected memos to the clipboard"
+msgstr "è¤?è£½é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
+
+#: ../calendar/gui/e-memo-table.c:731
+msgid "Paste memos from the clipboard"
+msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
+
+#: ../calendar/gui/e-memo-table.c:737
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+msgid "Delete selected memos"
+msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
+
+#: ../calendar/gui/e-memo-table.c:743
+msgid "Select all visible memos"
+msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:1099
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "è«?æ??é??è£?å¢?å? æ?°ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memos.c:754
-#: ../calendar/gui/e-tasks.c:902
-#, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"ç?¼ç??æ?¼ %s ç??é?¯èª¤ï¼?\n"
-" %s"
+#: ../calendar/gui/e-task-table.c:542
+msgid "0%"
+msgstr "0%"
 
-#: ../calendar/gui/e-memos.c:806
-msgid "Loading memos"
-msgstr "æ£å?¨è¼?å?¥å??å¿?é??"
+#: ../calendar/gui/e-task-table.c:543
+msgid "10%"
+msgstr "10%"
 
-#: ../calendar/gui/e-memos.c:897
-#, c-format
-msgid "Opening memos at %s"
-msgstr "é??å??å?¨ %s ç??å??å¿?é??"
+#: ../calendar/gui/e-task-table.c:544
+msgid "20%"
+msgstr "20%"
 
-#: ../calendar/gui/e-memos.c:1066
-#: ../calendar/gui/e-tasks.c:1318
-msgid "Deleting selected objects..."
-msgstr "æ£å?¨å?ªé?¤é?¸å®?ç??ç?©ä»¶..."
+#: ../calendar/gui/e-task-table.c:545
+msgid "30%"
+msgstr "30%"
 
-#: ../calendar/gui/e-tasks.c:955
-msgid "Loading tasks"
-msgstr "æ£å?¨è¼?å?¥å·¥ä½?"
+#: ../calendar/gui/e-task-table.c:546
+msgid "40%"
+msgstr "40%"
 
-#: ../calendar/gui/e-tasks.c:1052
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "é??å??å?¨ %s ç??å·¥ä½?"
+#: ../calendar/gui/e-task-table.c:547
+msgid "50%"
+msgstr "50%"
 
-#: ../calendar/gui/e-tasks.c:1295
-msgid "Completing tasks..."
-msgstr "æ£å?¨å®?æ??å·¥ä½?..."
+#: ../calendar/gui/e-task-table.c:548
+msgid "60%"
+msgstr "60%"
 
-#: ../calendar/gui/e-tasks.c:1345
-msgid "Expunging"
-msgstr "é?¤å?»ä¸"
+#: ../calendar/gui/e-task-table.c:549
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-task-table.c:550
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-task-table.c:551
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-task-table.c:552
+msgid "100%"
+msgstr "100%"
 
-#: ../calendar/gui/e-timezone-entry.c:124
+#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2006
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../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/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "å·¥ä½?"
+
+#: ../calendar/gui/e-task-table.c:940
+msgid "Cut selected tasks to the clipboard"
+msgstr "å?ªä¸?é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
+
+#: ../calendar/gui/e-task-table.c:946
+msgid "Copy selected tasks to the clipboard"
+msgstr "è¤?è£½é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
+
+#: ../calendar/gui/e-task-table.c:952
+msgid "Paste tasks from the clipboard"
+msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å·¥ä½?"
+
+#: ../calendar/gui/e-task-table.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:701
+msgid "Delete selected tasks"
+msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
+
+#: ../calendar/gui/e-task-table.c:964
+msgid "Select all visible tasks"
+msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å·¥ä½?"
+
+#: ../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:376
-#: ../calendar/gui/print.c:1647
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1679
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2673
-msgid "_Custom View"
-msgstr "è?ªé?¸æª¢è¦?(_C)"
+#: ../calendar/gui/ea-cal-view-event.c:263
+msgid "It has alarms."
+msgstr "å®?å?·æ??é¬§é?´ã??"
 
-#: ../calendar/gui/gnome-cal.c:2674
-msgid "_Save Custom View"
-msgstr "å?²å?è?ªé?¸æª¢è¦?(_S)"
+#: ../calendar/gui/ea-cal-view-event.c:266
+msgid "It has recurrences."
+msgstr "å®?æ?¯é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/gnome-cal.c:2679
-msgid "_Define Views..."
-msgstr "å®?ç¾©æª¢è¦?(_D)..."
+#: ../calendar/gui/ea-cal-view-event.c:269
+msgid "It is a meeting."
+msgstr "é??æ?¯ä¸?é ?æ??è°ã??"
 
-#: ../calendar/gui/gnome-cal.c:2916
+#: ../calendar/gui/ea-cal-view-event.c:275
 #, c-format
-msgid "Loading appointments at %s"
-msgstr "è¼?å?¥ %s ç??ç´?æ??"
+msgid "Calendar Event: Summary is %s."
+msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ??è¦?ç?º %sã??"
+
+#: ../calendar/gui/ea-cal-view-event.c:277
+msgid "Calendar Event: It has no summary."
+msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ²?æ??æ??è¦?ã??"
+
+#: ../calendar/gui/ea-cal-view-event.c:299
+msgid "calendar view event"
+msgstr "è¡?äº?æ??æª¢è¦?äº?ä»¶"
+
+#: ../calendar/gui/ea-cal-view-event.c:527
+msgid "Grab Focus"
+msgstr "å¾?å?°ç?¦é»?"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Appointment"
+msgstr "æ?°å¢?ç´?æ??"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "New All Day Event"
+msgstr "æ?°å¢?å?¨å¤©äº?ä»¶"
+
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "New Meeting"
+msgstr "æ?°å¢?æ??è°"
+
+#: ../calendar/gui/ea-cal-view.c:303
+msgid "Go to Today"
+msgstr "ç§»è?³ä»?æ?¥"
+
+#: ../calendar/gui/ea-cal-view.c:304
+msgid "Go to Date"
+msgstr "ç§»è?³æ?¥æ??"
+
+#: ../calendar/gui/ea-day-view-main-item.c:305
+#: ../calendar/gui/ea-week-view-main-item.c:302
+msgid "a table to view and select the current time range"
+msgstr "ç?¨ä¾?æª¢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??è¡¨æ ¼"
 
-#: ../calendar/gui/gnome-cal.c:2931
+#. 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:147 ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "è¼?å?¥ %s ç??å·¥ä½?"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "å®?æ?? %d å??äº?ä»¶ã??"
+msgstr[1] "å®?æ?? %d å??äº?ä»¶ã??"
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "å®?æ²?æ??äº?ä»¶ã??"
 
-#: ../calendar/gui/gnome-cal.c:2940
+#. 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:158
 #, c-format
-msgid "Loading memos at %s"
-msgstr "æ£å?¨è¼?å?¥ %s ç??å??å¿?é??"
+msgid "Work Week View: %s. %s"
+msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/gnome-cal.c:3052
+#. 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:164
 #, c-format
-msgid "Opening %s"
-msgstr "æ£å?¨é??å?? %s"
+msgid "Day View: %s. %s"
+msgstr "æ?¥æª¢è¦?ï¼?%sã??%s"
+
+#: ../calendar/gui/ea-day-view.c:195
+msgid "calendar view for a work week"
+msgstr "å·¥ä½?é?±ç??è¡?äº?æ??æª¢è¦?"
+
+#: ../calendar/gui/ea-day-view.c:197
+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
+msgid "Gnome Calendar"
+msgstr "Gnome è¡?äº?æ??"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:909
+msgid "%A %d %b %Y"
+msgstr "%Y/%m/%d (%a)"
+
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
+msgid "%a %d %b %Y"
+msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%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:240
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
+msgid "%d %b %Y"
+msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
+
+#: ../calendar/gui/ea-jump-button.c:147
+msgid "Jump button"
+msgstr "è·³èº?æ??é??"
+
+#: ../calendar/gui/ea-jump-button.c:156
+msgid "Click here, you can find more events."
+msgstr "æ??é??è£?ï¼?ä½ å?¯ä»¥æ?¾å?°æ?´å¤?äº?ä»¶ã??"
+
+#: ../calendar/gui/ea-week-view.c:153
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "æ??æª¢è¦?ï¼?%sã??%s"
+
+#: ../calendar/gui/ea-week-view.c:157
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "é?±æª¢è¦?ï¼?%sã??%s"
+
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??æª¢è¦?"
+
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??æª¢è¦?"
+
+#: ../calendar/gui/gnome-cal.c:1942
+#, c-format
+msgid "Loading appointments at %s"
+msgstr "è¼?å?¥ %s ç??ç´?æ??"
 
-#: ../calendar/gui/gnome-cal.c:4018
+#: ../calendar/gui/gnome-cal.c:2557
 msgid "Purging"
 msgstr "æ¸?é?¤"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
-msgstr ""
-"ä¸?æ??\n"
-"äº?æ??\n"
-"ä¸?æ??\n"
-"å??æ??\n"
-"äº?æ??\n"
-"å?æ??\n"
-"ä¸?æ??\n"
-"å?«æ??\n"
-"ä¹?æ??\n"
-"å??æ??\n"
-"å??ä¸?æ??\n"
-"å??äº?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:1
+msgid "April"
+msgstr "å??æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:2
+msgid "August"
+msgstr "å?«æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:3
+msgid "December"
+msgstr "å??äº?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:4
+msgid "February"
+msgstr "äº?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:5
+msgid "January"
+msgstr "ä¸?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:6
+msgid "July"
+msgstr "ä¸?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:7
+msgid "June"
+msgstr "å?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:8
+msgid "March"
+msgstr "ä¸?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:9
+msgid "May"
+msgstr "äº?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:10
+msgid "November"
+msgstr "å??ä¸?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:11
+msgid "October"
+msgstr "å??æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "é?¸æ??æ?¥æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:13
+msgid "September"
+msgstr "ä¹?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "é?¸æ??ä»?å¤©(_S)"
 
-#: ../calendar/gui/itip-utils.c:410
-#: ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:553
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??äººã??"
 
-#: ../calendar/gui/itip-utils.c:453
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?å??å?°æ??è??"
 
-#: ../calendar/gui/itip-utils.c:635
-#: ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:784
 msgid "Event information"
 msgstr "äº?ä»¶è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:637
-#: ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:787
 msgid "Task information"
 msgstr "å·¥ä½?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:639
-#: ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:790
 msgid "Memo information"
 msgstr "å??å¿?é??è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:641
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:643 ../calendar/gui/itip-utils.c:808
 msgid "Free/Busy information"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:646
 msgid "Calendar information"
 msgstr "è¡?äº?æ??è³?è¨?"
 
@@ -7256,7 +6020,7 @@ msgstr "è¡?äº?æ??è³?è¨?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:680
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "å·²æ?¥å??"
@@ -7265,7 +6029,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:684
+#: ../calendar/gui/itip-utils.c:687
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
@@ -7277,8 +6041,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:691
-#: ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:742
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "å·²æ??çµ?"
@@ -7287,7 +6050,7 @@ msgstr "å·²æ??çµ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:701
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
@@ -7295,7 +6058,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:711
+#: ../calendar/gui/itip-utils.c:714
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "å·²æ?´æ?°"
@@ -7303,7 +6066,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:718
+#: ../calendar/gui/itip-utils.c:721
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -7311,7 +6074,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:725
+#: ../calendar/gui/itip-utils.c:728
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "é??æ?°æ?´ç??"
@@ -7319,429 +6082,231 @@ 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:732
+#: ../calendar/gui/itip-utils.c:735
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??ç¥¨è¡¨å?³"
 
-#: ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:805
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨? (%s å?° %s)"
 
-#: ../calendar/gui/itip-utils.c:810
+#: ../calendar/gui/itip-utils.c:813
 msgid "iCalendar information"
 msgstr "iCalendar è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:981
-msgid "You must be an attendee of the event."
-msgstr "ä½ å¿?é ?æ?¯æ¤äº?ä»¶ç??å?°æ??è??ã??"
-
-#: ../calendar/gui/memos-component.c:477
-msgid "_New Memo List"
-msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
-
-#: ../calendar/gui/memos-component.c:560
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d é ?å??å¿?é??"
-msgstr[1] "%d é ?å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:562
-#: ../calendar/gui/tasks-component.c:555
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] "ï¼?å·²é?¸æ?? %d å??"
-msgstr[1] "ï¼?å·²é?¸æ?? %d å??"
-
-#: ../calendar/gui/memos-component.c:609
-msgid "Failed upgrading memos."
-msgstr "å??ç´?å??å¿?é??å¤±æ??ã??"
-
-#: ../calendar/gui/memos-component.c:739
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "ç?¡æ³?é??å??å??å¿?é??æ¸?å?®ã??%sã??ä¾?å»ºç«?äº?ä»¶å??æ??è°"
-
-#: ../calendar/gui/memos-component.c:752
-msgid "There is no calendar available for creating memos"
-msgstr "æ²?æ??å?¯ç?¨ç??è¡?äº?æ??ä¾?å»ºç«?å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:862
-msgid "Memo Source Selector"
-msgstr "å??å¿?é??ä¾?æº?é?¸æ??å?¨"
-
-#: ../calendar/gui/memos-component.c:1041
-msgid "New memo"
-msgstr "æ?°å¢?å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:1042
-msgctxt "New"
-msgid "Mem_o"
-msgstr "å??å¿?é??(_O)"
-
-#: ../calendar/gui/memos-component.c:1043
-msgid "Create a new memo"
-msgstr "å»ºç«?æ?°ç??å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:1049
-msgid "New shared memo"
-msgstr "æ?°å¢?å?±ç?¨å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:1050
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "å?±ç?¨å??å¿?é??(_S)"
-
-#: ../calendar/gui/memos-component.c:1051
-msgid "Create a shared new memo"
-msgstr "å»ºç«?æ?°ç??å?±ç?¨å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:1057
-msgid "New memo list"
-msgstr "æ?°å??å¿?é??æ¸?å?®"
-
-#: ../calendar/gui/memos-component.c:1058
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "å??å¿?é??æ¸?å?®(_S)"
-
-#: ../calendar/gui/memos-component.c:1059
-msgid "Create a new memo list"
-msgstr "å»ºç«?æ?°å??å¿?é??æ¸?å?®"
-
-# zh_HK: msgstr "æ??å?°å??å¿?é??"
-#: ../calendar/gui/memos-control.c:386
-#: ../calendar/gui/memos-control.c:402
-msgid "Print Memos"
-msgstr "æ??å?°å??å¿?é??"
-
-#: ../calendar/gui/migration.c:157
-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..."
+#: ../calendar/gui/itip-utils.c:833
+msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"Evolution å·¥ä½?è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.xå¾?å°±æ?´æ?¹äº?ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../calendar/gui/migration.c:161
-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 ""
-"Evolution è¡?äº?æ??è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±æ?´æ?¹äº?ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:774
-#: ../calendar/gui/migration.c:942
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "ç?¡æ³?å¾? evolution/config.xmldb ç§»è½?è??è¨å®?"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:803
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "ç?¡æ³?ç§»è½?ç§»è¡?äº?æ?? `%s'"
+#: ../calendar/gui/itip-utils.c:835
+#, fuzzy
+msgid "Unable to book a resource, error: "
+msgstr "é?¯èª¤ï¼?ç?¡æ³?è??ç??å»¶ä¼¸"
 
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:971
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "ç?¡æ³?ç§»è½?å·¥ä½? `%s'"
+#: ../calendar/gui/itip-utils.c:988
+msgid "You must be an attendee of the event."
+msgstr "ä½ å¿?é ?æ?¯æ¤äº?ä»¶ç??å?°æ??è??ã??"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "Mo"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "Tu"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "We"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "Fr"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "Sa"
 msgstr "å?"
 
-#: ../calendar/gui/print.c:2465
+#: ../calendar/gui/print.c:2525
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2527
 msgid "Task"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/print.c:2492
+#: ../calendar/gui/print.c:2552
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:2575
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2629
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2644
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2655
 #, c-format
 msgid "URL: %s"
 msgstr "ç¶²å??: %s"
 
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/print.c:2668
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2619
+#: ../calendar/gui/print.c:2679
 msgid "Contacts: "
 msgstr "è?¯çµ¡äºº: "
 
-#: ../calendar/gui/tasks-component.c:470
-msgid "_New Task List"
-msgstr "æ?°å¢?å·¥ä½?æ¸?å?®(_N)"
-
-#: ../calendar/gui/tasks-component.c:553
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d é ?å·¥ä½?"
-msgstr[1] "%d é ?å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:602
-msgid "Failed upgrading tasks."
-msgstr "å??ç´?å·¥ä½?å¤±æ??ã??"
-
-#: ../calendar/gui/tasks-component.c:735
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "ç?¡æ³?é??å??å·¥ä½?æ¸?å?® '%s' ä¾?å»ºç«?äº?ä»¶å??æ??è°"
-
-#: ../calendar/gui/tasks-component.c:748
-msgid "There is no calendar available for creating tasks"
-msgstr "æ²?æ??å?¯ç?¨ç??è¡?äº?æ??ä¾?å»ºç«?å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:859
-msgid "Task Source Selector"
-msgstr "å·¥ä½?ä¾?æº?é?¸æ??å?¨"
-
-#: ../calendar/gui/tasks-component.c:1113
-msgid "New task"
-msgstr "æ?°å¢?å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:1114
-msgctxt "New"
-msgid "_Task"
-msgstr "å·¥ä½?(_T)"
-
-#: ../calendar/gui/tasks-component.c:1115
-msgid "Create a new task"
-msgstr "å»ºç«?ä¸?å??æ?°ç??å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:1121
-msgid "New assigned task"
-msgstr "æ?°æ??å®?ç??å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:1122
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
-
-#: ../calendar/gui/tasks-component.c:1123
-msgid "Create a new assigned task"
-msgstr "å»ºç«?æ?°æ??å®?ç??å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:1129
-msgid "New task list"
-msgstr "æ?°å·¥ä½?æ¸?å?®"
-
-#: ../calendar/gui/tasks-component.c:1130
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "å·¥ä½?æ¸?å?®(_K)"
-
-#: ../calendar/gui/tasks-component.c:1131
-msgid "Create a new task list"
-msgstr "å»ºç«?æ?°å·¥ä½?æ¸?å?®"
-
-#: ../calendar/gui/tasks-control.c:484
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"é??å??å??ä½?æ??æ°¸ä¹?å?°æ¸?é?¤æ??æ??æ¨?ç¤ºç?ºå·²å®?æ??ç??å·¥ä½?ã??å¦?æ??ä½ è¦?ç¹¼çº?ï¼?ä½ å°?ä¸?è?½å¾©å??é??äº?å·¥ä½?ã??\n"
-"\n"
-"ç¢ºå®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
-
-#: ../calendar/gui/tasks-control.c:487
-#: ../mail/em-folder-view.c:1126
-msgid "Do not ask me again."
-msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯ã??"
-
-#: ../calendar/gui/tasks-control.c:524
-#: ../calendar/gui/tasks-control.c:540
-msgid "Print Tasks"
-msgstr "æ??å?°å·¥ä½?"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -7755,13 +6320,11 @@ msgstr "å·²å??æ¶?"
 msgid "In progress"
 msgstr "æ£å?¨é?²è¡?"
 
-#: ../calendar/gui/tasktypes.xml.h:28
-#: ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "å¤§æ?¼"
 
-#: ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "å°?æ?¼"
 
@@ -7770,8 +6333,8 @@ msgid "Appointments and Meetings"
 msgstr "ç´?æ??å??æ??è°"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1820
 msgid "Opening calendar"
 msgstr "é??å??è¡?äº?æ??"
 
@@ -7795,11 +6358,11 @@ msgstr "vCalendar æª?æ¡? (.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar è¼¸å?¥å?¨"
 
-#: ../calendar/importers/icalendar-importer.c:746
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "è¡?äº?æ??äº?ä»¶"
 
-#: ../calendar/importers/icalendar-importer.c:783
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution è¡?äº?æ??æ?ºæ?§è¼¸å?¥å?¨"
 
@@ -8352,7 +6915,7 @@ msgid "America/Nassau"
 msgstr "ç¾?æ´²/æ?¿ç´¢"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "ç¾?æ´²/ç´?ç´?"
 
@@ -9352,291 +7915,280 @@ msgstr "å¤ªå¹³æ´?/ç?¦å?©æ?¯"
 msgid "Pacific/Yap"
 msgstr "å¤ªå¹³æ´?/é??æµ¦å³¶"
 
-#: ../composer/e-composer-autosave.c:445
-msgid "Unable to retrieve message from editor"
-msgstr "ç?¡æ³?å¾?ç·¨è¼¯å?¨å??å¾?é?µä»¶"
-
-#: ../composer/e-composer-actions.c:84
+#: ../composer/e-composer-actions.c:79
 msgid "Untitled Message"
 msgstr "æ?ªå?½å??ç??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:202
+msgid "Save as..."
+msgstr "å?¦å?æ?°æª?..."
+
+#: ../composer/e-composer-actions.c:281
 #: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:322
-#: ../mail/mail-signature-editor.c:195
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:286
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "é??é??(_C)"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:288
 msgid "Close the current file"
 msgstr "é??é??ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:329
-#: ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58
-#: ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:119
-#: ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:293
 msgid "_Print..."
 msgstr "æ??å?°(_P)..."
 
-#: ../composer/e-composer-actions.c:336
-#: ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:72
-#: ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:300
 msgid "Print Pre_view"
 msgstr "é ?è¦½æ??å?°(_V)"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:309
 msgid "Save the current file"
 msgstr "å?²å?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:314
 msgid "Save _As..."
 msgstr "å?¦å?æ?°æª?(_A)..."
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:316
 msgid "Save the current file with a different name"
 msgstr "ä»¥å?¦ä¸?å??å??ç¨±å?²å?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:321
 msgid "Save as _Draft"
 msgstr "å?²å?ç?ºè??ç¨¿(_D)"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:323
 msgid "Save as draft"
 msgstr "å?²å?ç?ºè??ç¨¿"
 
-#: ../composer/e-composer-actions.c:364
-#: ../composer/e-composer-private.c:191
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:264
 msgid "S_end"
 msgstr "å?³é??(_E)"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:330
 msgid "Send this message"
 msgstr "å?³é??é??å??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:373
-msgid "Insert Send options"
-msgstr "æ??å?¥å?³é??é?¸é ?"
-
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:335
 msgid "New _Message"
 msgstr "æ?°å¯«æ?°é?µä»¶(_M)"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:337
 msgid "Open New Message window"
 msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:344
 msgid "Character _Encoding"
 msgstr "å?ç¬¦ç·¨ç¢¼(_E)"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:351
 msgid "_Security"
 msgstr "å®?å?¨æ?§(_S)"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PG_P å? å¯?"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "ä½¿ç?¨ PGP å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "P_GP å? ç°½"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨ä½ ç?? PGP å¯?ç¢¼å??ç?ºé?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½²"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:377
 msgid "_Prioritize Message"
 msgstr "é?µä»¶å?ªå??æ¬?(_P)"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:379
 msgid "Set the message priority to high"
 msgstr "å°?é?µä»¶å?ªå??æ¬?è¨ç?ºã??é«?ã??"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:385
 msgid "Re_quest Read Receipt"
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?(_Q)"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:387
 msgid "Get delivery notification when your message is read"
 msgstr "å?¨ä½ ç??é?µä»¶è¢«é?±è®?æ??å??å¾?é??ä¿¡é??ç?¥"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:393
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME å? å¯?"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ä½¿ç?¨ä½ ç?? S/MIME å? å¯?è?æ?¸å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME å? ç°½"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨ä½ ç?? S/MIME ç°½ç½²è?æ?¸ç?ºé?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½²"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
 msgstr "å¯?ä»¶å?¯æ?¬æ¬?ä½?(_B)"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
 msgstr "å??æ??å¯?ä»¶å?¯æ?¬æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:460
+#: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
 msgstr "å?¯æ?¬æ¬?ä½?(_C)"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
 msgstr "å??æ??å?¯æ?¬æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:468
+#: ../composer/e-composer-actions.c:425
 msgid "_From Field"
 msgstr "å¯?ä»¶è??æ¬?ä½?(_F)"
 
-#: ../composer/e-composer-actions.c:470
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
 msgstr "å??æ??å¯?ä»¶è??é?¸æ??å?¨ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:476
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "å??è¦?æ¬?ä½?(_R)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "å??æ??å??è¦?æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:478
 msgid "Save Draft"
 msgstr "å?²å?è??ç¨¿"
 
-#: ../composer/e-composer-header.c:120
+#: ../composer/e-composer-header.c:129
 msgid "Show"
 msgstr "é¡¯ç¤º"
 
-#: ../composer/e-composer-header.c:123
+#: ../composer/e-composer-header.c:137
 msgid "Hide"
 msgstr "é?±è??"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
 msgstr "è¼¸å?¥é?µä»¶ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:44
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "è¼¸å?¥é?µä»¶å?¯æ?¬ç??æ?¶ä»¶è??"
 
-#: ../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"
+#: ../composer/e-composer-header-table.c:47
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
 msgstr "è¼¸å?¥é?µä»¶å¯?ä»¶å?¯æ?¬ç??æ?¶ä»¶è??ï¼?ä»?å??æ??æ?¶å?°é??å°?é?µä»¶ä½?ä¸?æ??å?ºç?¾å?¨é?µä»¶ç??æ?¶ä»¶è??æ¸?å?®"
 
-#: ../composer/e-composer-header-table.c:945
+#: ../composer/e-composer-header-table.c:959
 msgid "Fr_om:"
 msgstr "å¯?ä»¶è??(_O):"
 
-#: ../composer/e-composer-header-table.c:945
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:923
-#: ../mail/em-mailer-prefs.c:76
-#: ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:296
+#: ../composer/e-composer-header-table.c:959
+#: ../em-format/em-format-quote.c:224 ../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:954
+#: ../composer/e-composer-header-table.c:968
 msgid "_Reply-To:"
 msgstr "å??è¦?å?°å??(_R):"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:973
 msgid "_To:"
 msgstr "æ?¶ä»¶è??(_T):"
 
-#: ../composer/e-composer-header-table.c:965
+#: ../composer/e-composer-header-table.c:979
 msgid "_Cc:"
 msgstr "å?¯æ?¬(_C):"
 
-#: ../composer/e-composer-header-table.c:965
-#: ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "å?¯æ?¬(CC)"
 
-#: ../composer/e-composer-header-table.c:971
+#: ../composer/e-composer-header-table.c:985
 msgid "_Bcc:"
 msgstr "å¯?ä»¶å?¯æ?¬(_B):"
 
-#: ../composer/e-composer-header-table.c:971
-#: ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "å¯?ä»¶å?¯æ?¬(BCC)"
 
-#: ../composer/e-composer-header-table.c:976
+#: ../composer/e-composer-header-table.c:990
 msgid "_Post To:"
 msgstr "å¼µè²¼å?°(_P):"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:994
 msgid "S_ubject:"
 msgstr "ä¸»æ?¨(_U):"
 
-#: ../composer/e-composer-header-table.c:989
+#: ../composer/e-composer-header-table.c:1003
 msgid "Si_gnature:"
 msgstr "ç°½å??æª?(_G):"
 
-#: ../composer/e-composer-name-header.c:116
+#: ../composer/e-composer-name-header.c:134
 msgid "Click here for the address book"
 msgstr "æ??é??è£?æ?°å¢?ç?®é??æ??å??"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "å¼µè²¼ç??ç?®ç??ç«¯"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??è£?ï¼?é?¸å??è¦?å¼µè²¼ç??è³?æ??å¤¾"
 
-#: ../composer/e-composer-private.c:208
+#: ../composer/e-composer-private.c:280
 msgid "Save draft"
 msgstr "å?²å?è??ç¨¿"
 
-#: ../composer/e-msg-composer.c:808
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+#. Check buttons
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯(_D)"
+
+#: ../composer/e-msg-composer.c:983
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç?¡æ³?ç°½ç½²é??å?ºç??é?µä»¶ï¼?æ¤å¸³è??æ²?æ??è¨å®?ç°½ç½²è?æ?¸"
 
-#: ../composer/e-msg-composer.c:815
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+#: ../composer/e-msg-composer.c:990
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??è¨å®?å? å¯?è?æ?¸(æ¤å¸³è??)"
 
-#: ../composer/e-msg-composer.c:1351
-#: ../composer/e-msg-composer.c:2190
+#: ../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
 msgid "Compose Message"
 msgstr "ç·¨è¼¯é?µä»¶"
 
-#: ../composer/e-msg-composer.c:3348
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+#: ../composer/e-msg-composer.c:3310
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
 msgstr "<b>ï¼?é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å?ç??é?µä»¶å?§æ??ã??ï¼?<b>"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr "é??è£?æ??ä¸?äº?é??ä»¶è¦?ä¸?è¼?ã??å?³é??æ¤é?µä»¶å°?ç?¡æ³?ä¸?ä½µå¯?å?ºæ?¥ä¸?ä¾?ç??é??ä»¶"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -9644,7 +8196,9 @@ msgid "All accounts have been removed."
 msgstr "æ??æ??å¸³è??å·²ç¶?ç§»é?¤ã??"
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr "ç¢ºå®?è¦?æ?¾æ£?æ£å?¨æ?°å¯«ï¼?æ¨?é¡?ç?º â??{0}â?? ç??é?µä»¶ï¼?"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -9656,7 +8210,10 @@ msgid "Because &quot;{1}&quot;."
 msgstr "å? ç?ºã??{1}ã??ã??"
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr "é?¤é??ä½ é?¸æ??å?²å?é?µä»¶è?³ã??è??ç¨¿ã??è³?æ??å¤¾ï¼?å?¦å??é??é??æ¤æ?°å¯«è¦?çª?æ??æ°¸ä¹?æ?¾æ£?é?µä»¶ã??å?²å?è??ç¨¿å?¯ä»¥è®?ä½ ä»¥å¾?å??ç¹¼çº?æ?°å¯«é?µä»¶ã??"
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -9680,97 +8237,88 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "ç?¡æ³?å?²å?è?³è?ªå??å?²å?æª?æ¡?ã??{0}ã??ã??"
 
 #: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "ç?¡æ³?é??å? ç?®é??å?°é?µä»¶ã??"
-
-#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "è¦?å¾©å??æ?ªå®?æ??ç??é?µä»¶ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "ä¸?è¼?å°?å?¨é?²è¡?ä¸ã??æ?¯å?¦å¯?å?ºé?µä»¶ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "å?²å?è?³è?ªå??å?²å?æ??ç?¼ç??é?¯èª¤ï¼?å? ç?ºã??{1}ã??ã??"
 
-#: ../composer/mail-composer.error.xml.h:16
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+#: ../composer/mail-composer.error.xml.h:15
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr "ç?¶ä½ æ?°å¯«æ?°é?µä»¶æ??ï¼?Evolution æ??å¤?çµ?æ??ã??å¾©å??é?µä»¶å?¯ä»¥è®?ä½ å¾?å??ä¾?ä¸æ?·ç??å?°æ?¹ç¹¼çº?ã??"
 
-#: ../composer/mail-composer.error.xml.h:17
-msgid "Send options available only for Novell GroupWise and Microsoft Exchange accounts."
-msgstr "å?³é??å??ç?¨æ?¼ Novell GroupWise è?? Microsoft Exchange å¸³è??ç??é?¸é ?ã??"
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "å?³é??é?¸é ?ç?¡æ³?ä½¿ç?¨ã??"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../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}' ä¸?æ?¯ä¸?è?¬æª?æ¡?è??ä¸?ç?¡æ³?å?¨é?µä»¶ä¸å?³é??ã??"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
-msgstr "è¦?é??å? æ¤ç?®é??ç??å?§å®¹ï¼?è«?å??å?¥é??å? æ¤ç?®é??ä¸ç??æª?æ¡?ï¼?æ??è??å»ºç«?ç?®é??ç??æ¸æª?å??å? ä»¥é??å? å®?ã??"
-
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 "ç?¡æ³?å??å?? HTML ç·¨è¼¯å?¨æ?§å?¶ã??\n"
 "\n"
 "è«?ç¢ºå®?ä½ å®?è£?ç??æ?¯æ£ç¢ºç??gtkhtml å?? libgtkhtml ç??æ?¬ã??"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "ç?¡æ³?å??å??å?°å??é?¸æ??å?¨æ?§å?¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "Unfinished messages found"
-msgstr "æ?¾å?°æ?ªå®?æ??ç??é?µä»¶"
-
-#: ../composer/mail-composer.error.xml.h:26
-msgid "Warning: Modified Message"
-msgstr "è¦å??ï¼?ç·¨è¼¯é??ç??é?µä»¶"
-
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:21
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "ä½ ç?¡æ³?å°?æª?æ¡? â??{0}â?? é??å? å?°æ¤é?µä»¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "æ?°å¯«é?µä»¶å??ï¼?ä½ é??è¦?å??è¨å®?å¸³è??ã??"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "ç¹¼çº?ç·¨è¼¯(_C)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "ä¸?è¦?å¾©å??(_D)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "å¾©å??(_R)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "å?²å?è??ç¨¿(_S)"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
+msgstr "è¡?äº?æ??äº?ä»¶é??ç?¥"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr "Evolution é¬§é?´é??ç?¥"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
+#: ../shell/e-shell-window-private.c:255
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution é?µä»¶è??è¡?äº?æ??"
 
-#: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:947
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
 msgid "Groupware Suite"
 msgstr "Groupware å¥?è£?è»?ä»¶"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "ç®¡ç??ä½ ç??é?µä»¶ã??è?¯çµ¡äººå??è¡?ç¨?"
 
@@ -9782,17 +8330,126 @@ msgstr "å?°å??å?¡"
 msgid "calendar information"
 msgstr "è¡?äº?æ??è³?è¨?"
 
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s ï¼?å·²å??æ¶?ï¼?"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (completed)"
+msgstr "%s ï¼?å·²å®?æ??ï¼? "
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, c-format
+msgid "%s..."
+msgstr "%s..."
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% å®?æ??)"
+
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "Evolution é?¯èª¤"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "Evolution è¦å??"
+
+#: ../e-util/e-alert.c:634
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "é?¿æ??ä¼¯æ??"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "æ³¢ç¾?ç??æµ·èª?ç³»"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "ä¸æ?èª?ç³»"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "ä¸æ??"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "æ?¯æ??å¤«èª?ç³»"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "å¸?è??æ??"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "å¸?ä¼¯ä¾?æ??"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "æ?¥æ??"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "é??æ??"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "æ³°æ??"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "å??è?³å?¶æ??"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "è?¬å??ç¢¼"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "è¥¿æ?èª?ç³»"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "è¥¿æ?èª?ç³»ï¼?æ?°"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+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
+msgid "Simplified"
+msgstr "ç°¡é«?"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "ç??å??è?èª?"
+
+#: ../e-util/e-charset.c:97
+msgid "Visual"
+msgstr "è¦?è¦º"
+
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../plugins/itip-formatter/itip-view.c:191
-#: ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:304
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../plugins/itip-formatter/itip-view.c:195
+#: ../widgets/table/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "ä»?å¤©"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "æ??å¤©"
 
@@ -9810,8 +8467,7 @@ msgstr "å¾?ç?¾å?¨èµ· %d å¤©"
 msgid "%d days ago"
 msgstr "%d å¤©å??"
 
-#: ../e-util/e-datetime-format.c:283
-#: ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
 #: ../e-util/e-datetime-format.c:302
 msgid "Use locale default"
 msgstr "ä½¿ç?¨å?°å??è¨å®?é ?è¨å?¼"
@@ -9820,109 +8476,95 @@ msgstr "ä½¿ç?¨å?°å??è¨å®?é ?è¨å?¼"
 msgid "Format:"
 msgstr "æ ¼å¼?ï¼?"
 
-#: ../e-util/e-error.c:78
-#: ../e-util/e-error.c:79
-#: ../e-util/e-error.c:121
-msgid "Evolution Error"
-msgstr "Evolution é?¯èª¤"
-
-#: ../e-util/e-error.c:80
-#: ../e-util/e-error.c:81
-#: ../e-util/e-error.c:119
-msgid "Evolution Warning"
-msgstr "Evolution è¦å??"
-
-#: ../e-util/e-error.c:118
-msgid "Evolution Information"
-msgstr "Evolution è³?è¨?"
+#: ../e-util/e-file-utils.c:136
+msgid "(Unknown Filename)"
+msgstr "ï¼?ä¸?æ??ç??æª?æ¡?å??ç¨±ï¼?"
 
-#: ../e-util/e-error.c:120
-msgid "Evolution Query"
-msgstr "Evolution æ?¥è©¢"
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:140
+#, c-format
+msgid "Writing \"%s\""
+msgstr "æ£å?¨å¯«å?¥ã??%sã??"
 
-#. setup a dummy error
-#: ../e-util/e-error.c:448
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:145
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-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-logger.c:161
-msgid "Component"
-msgstr "å??ä»¶"
+#: ../e-util/e-module.c:188
+msgid "Filename"
+msgstr "æª?æ¡?å??ç¨±"
 
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
-msgstr "å·²ç?»å?¥å??ä»¶ç??å??ç¨±"
+#: ../e-util/e-module.c:189
+msgid "The filename of the module"
+msgstr "æ¨¡çµ?ç??æª?æ¡?å??ç¨±"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:191
+#: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "é?¤é?¯ç´?é??æª?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:205
+#: ../e-util/e-non-intrusive-error-dialog.c:208
 msgid "Show _errors in the status bar for"
 msgstr "å?¨ç??æ??å??é¡¯ç¤ºæ¤é?¯èª¤(_E)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:223
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "ç§?ã??"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:229
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "ç´?é??æª?è¨?æ?¯:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:274
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "ç´?é??ç?ç´?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:380
-msgid "Time"
-msgstr "æ??é??"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:292
-#: ../mail/message-list.c:2527
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "é?µä»¶"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1430
 msgid "Close this window"
 msgstr "é??é??æ?¬è¦?çª?"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "é?¯èª¤"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "é?¯èª¤"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "è¦å??è??é?¯èª¤"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "å?µé?¯"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "é?¯èª¤ã??è¦å??è??é?¤é?¯è¨?æ?¯"
 
-#: ../e-util/e-plugin.c:308
-#: ../filter/rule-editor.c:798
-#: ../mail/em-account-prefs.c:477
-#: ../mail/em-composer-prefs.c:957
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:718
+#: ../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:309
+#: ../e-util/e-plugin.c:296
 msgid "Whether the plugin is enabled"
 msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
 
@@ -9935,15 +8577,15 @@ msgid "The printing system reported the following details about the error:"
 msgstr "æ??å?°ç³»çµ±å??å ±ä¸?å??é??æ?¼æ¤é?¯èª¤ç??è©³ç´°è³?è¨?ï¼?"
 
 #: ../e-util/e-print.c:173
-msgid "The printing system did not report any additional details about the error."
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "æ??å?°ç³»çµ±æ²?æ??å??å ±ä»»ä½?é??æ?¼æ¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
 
-#: ../e-util/e-signature.c:695
+#: ../e-util/e-signature.c:699
 msgid "Autogenerated"
 msgstr "è?ªå??ç?¢ç??ç??"
 
-#: ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "å? ç?ºã??{1}ã??ã??"
 
@@ -9963,257 +8605,303 @@ msgstr "è¦?è¦?å¯«å®??"
 msgid "File exists \"{0}\"."
 msgstr "æª?æ¡?å·²å?å?¨ã??{0}ã??ã??"
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "è¦?è??æª?æ¡?ï¼?"
-
-#: ../e-util/e-system.error.xml.h:7
-#: ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "è¦?å¯«(_O)"
 
-#: ../e-util/e-util.c:133
+#: ../e-util/e-util.c:140
 msgid "Could not open the link."
 msgstr "ç?¡æ³?é??å??è©²é?£çµ?ã??"
 
-#: ../e-util/e-util.c:183
+#: ../e-util/e-util.c:190
 msgid "Could not display help for Evolution."
 msgstr "ç?¡æ³?é¡¯ç¤º Evolution ç??æ±?å?©æ??ä»¶ã??"
 
-#: ../e-util/e-util-labels.c:45
-msgid "I_mportant"
-msgstr "é??è¦?(_M)"
+#: ../e-util/gconf-bridge.c:1276
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf é?¯èª¤ï¼?%s"
 
-#. red
-#: ../e-util/e-util-labels.c:46
-msgid "_Work"
-msgstr "å·¥ä½?(_W)"
+#: ../e-util/gconf-bridge.c:1287
+msgid "All further errors shown only on terminal."
+msgstr "æ??æ??é?²ä¸?æ¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?ç«¯æ©?ä¸é¡¯ç¤ºã??"
 
-#. orange
-#: ../e-util/e-util-labels.c:47
-msgid "_Personal"
-msgstr "å??äºº(_P)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "å??è¦?"
 
-#. green
-#: ../e-util/e-util-labels.c:48
-msgid "_To Do"
-msgstr "å¾?è¾¦äº?é ?(_T)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:961
+#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
+#: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "å?¯æ?¬"
 
-#. blue
-#: ../e-util/e-util-labels.c:49
-msgid "_Later"
-msgstr "ç¨?å¾?(_L)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
+#: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "å¯?ä»¶å?¯æ?¬"
 
-#: ../e-util/e-util-labels.c:320
-msgid "Label _Name:"
-msgstr "æ¨?ç±¤å??ç¨±(_N):"
+#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:963
+#: ../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
+msgid "Subject"
+msgstr "ä¸»æ?¨"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Edit Label"
-msgstr "ç·¨è¼¯æ¨?ç±¤"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2422
+#: ../modules/mail/em-mailer-prefs.c:1130
+msgid "Mailer"
+msgstr "å¯?ä»¶è??"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Add Label"
-msgstr "å? å?¥æ¨?ç±¤"
+#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1227
+msgid "-------- Forwarded Message --------"
+msgstr "-------- è½?é??ç??é?µä»¶ --------"
+
+#: ../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
+msgid "Date"
+msgstr "æ?¥æ??"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label name cannot be empty."
-msgstr "æ¨?ç±¤ç??å??ç¨±ä¸?è?½ç©ºç?½ã??"
+#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "æ?°è??ç¾£çµ?"
 
-#: ../e-util/e-util-labels.c:367
-msgid "A label having the same tag already exists on the server. Please rename your label."
-msgstr "ä¼ºæ??å?¨ä¸?å·²å?å?¨å??æ¨£ç??æ¨?ç±¤ã??è«?æ?´æ?¹ä½ ç??æ¨?ç±¤å??ç¨±ã??"
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "é?¢è²?"
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../em-format/em-format.c:1319
 #, c-format
-msgid "GConf error: %s"
-msgstr "GConf é?¯èª¤ï¼?%s"
+msgid "%s attachment"
+msgstr "%s é??ä»¶"
 
-#: ../e-util/gconf-bridge.c:1233
-msgid "All further errors shown only on terminal."
-msgstr "æ??æ??é?²ä¸?æ¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?ç«¯æ©?ä¸é¡¯ç¤ºã??"
+#: ../em-format/em-format.c:1374
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
+
+#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "ç?¡æ³?è§£æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
+
+#: ../em-format/em-format.c:1520
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message"
+msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../filter/filter-datespec.c:73
+#: ../em-format/em-format.c:1698
+msgid "Unsupported signature format"
+msgstr "ä¸?æ?¯æ?´ç??ç°½ç½²æ ¼å¼?"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+msgid "Error verifying signature"
+msgstr "æª¢é©?ç°½ç½²ç?¼ç??é?¯èª¤"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
+#: ../em-format/em-format.c:1847
+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:1924
+msgid "Could not parse PGP message: Unknown error"
+msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
+
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ç§?å??"
 msgstr[1] "%d ç§?å??"
 
-#: ../filter/filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 ç§?å¾?"
 msgstr[1] "%d ç§?å¾?"
 
-#: ../filter/filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 å??é??å¾?"
 msgstr[1] "%d å??é??å¾?"
 
-#: ../filter/filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 å°?æ??å¾?"
 msgstr[1] "%d å°?æ??å¾?"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 æ?¥å??"
 msgstr[1] "%d æ?¥å??"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 å¤©å¾?"
 msgstr[1] "%d å¤©å¾?"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 é?±å¾?"
 msgstr[1] "%d é?±å¾?"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 å??æ??å¾?"
 msgstr[1] "%d å??æ??å¾?"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 å¹´å¾?"
 msgstr[1] "%d å¹´å¾?"
 
-#: ../filter/filter-datespec.c:294
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
 
-#: ../filter/filter-datespec.c:297
-#: ../filter/filter-datespec.c:308
-#: ../filter/filter-datespec.c:319
+#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "ç?¾å?¨"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:304
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
-#: ../filter/filter-datespec.c:447
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
-#: ../filter/filter-file.c:281
-msgid "Choose a file"
-msgstr "é?¸æ??ä¸?å??æª?æ¡?"
-
-#: ../filter/filter-part.c:528
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "æ¸¬è©¦"
+#: ../filter/e-filter-file.c:184
+msgid "Choose a File"
+msgstr "é?¸æ??æª?æ¡?"
 
-#: ../filter/filter-rule.c:854
+#: ../filter/e-filter-rule.c:653
 msgid "R_ule name:"
 msgstr "è¦?å??å??ç¨±(_U):"
 
-#: ../filter/filter-rule.c:882
+#: ../filter/e-filter-rule.c:682
 msgid "Find items that meet the following conditions"
 msgstr "å°?æ?¾ç¬¦å??ä¸?å??æ¢?ä»¶ç??é ?ç?®"
 
-#: ../filter/filter-rule.c:916
+#: ../filter/e-filter-rule.c:716
 msgid "A_dd Condition"
 msgstr "å? å?¥æ¢?ä»¶(_D)"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:722
 msgid "If all conditions are met"
 msgstr "å¦?æ??å?¨é?¨æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "å¦?æ??ä»»ä½?æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/filter-rule.c:924
+#: ../filter/e-filter-rule.c:724
 msgid "_Find items:"
 msgstr "å°?æ?¾é ?ç?®(_F):"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:745
 msgid "All related"
 msgstr "æ??æ??ç?¸é??ç??"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:745 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "å??è¦?"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:745
 msgid "Replies and parents"
 msgstr "å??è¦?å??ç?¶ä»£"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:745
 msgid "No reply or parent"
 msgstr "æ²?æ??å??å¾©æ??å??å§?é?µä»¶"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/e-filter-rule.c:747
 msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾£çµ?(_N)"
 
-#: ../filter/filter-rule.c:1038
-#: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/e-filter-rule.c:1120 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:301
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/filter-rule.c:1038
-#: ../mail/em-utils.c:310
+#: ../filter/e-filter-rule.c:1120 ../mail/em-utils.c:302
 msgid "Outgoing"
 msgstr "å¤?å¯?"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "æ?°å¢?è¦?å??"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "ç·¨è¼¯è¦?å??"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "é?¯èª¤ç??æ£è¦?è¡¨ç¤ºå¼?ã??{0}ã??ã??"
@@ -10234,8 +8922,7 @@ msgstr "ç¼ºå°?æ?¥æ??ã??"
 msgid "Missing file name."
 msgstr "ç¼ºå°?æª?æ¡?å??ç¨±ã??"
 
-#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
 msgid "Missing name."
 msgstr "ç¼ºå°?å??ç¨±ã??"
 
@@ -10259,19 +8946,15 @@ msgstr "ä½ å¿?é ?ç?ºé??å??é??æ¿¾å?¨å?½å??ã??"
 msgid "You must specify a file name."
 msgstr "ä½ å¿?é ?æ??å®?ä¸?å??æª?æ¡?å??ç¨±ã??"
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>é??æ¿¾å?¨è¦?å??(_F)</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "æ¯?è¼?"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "é¡¯ç¤ºé?µä»¶é??æ¿¾å?¨:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10279,7 +8962,7 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??ä½ å?¨é??è£?æ??å®?\n"
 "æ?¥æ??ç?? 12:00am å??æ¯?è¼?ã??"
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10287,7 +8970,7 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??ç?¸å°?æ?¼é??æ¿¾å?¨å?·è¡?\n"
 "ç??æ??é??ä½?æ¯?è¼?ã??"
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10295,241 +8978,909 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??é??æ¿¾å?¨å?·è¡?æ??ç??\n"
 "æ??é??ä½?æ¯?è¼?ã??"
 
-#: ../filter/filter.glade.h:12
-msgid ""
-"ago\n"
-"in the future"
-msgstr ""
-"ä¹?å??\n"
-"ä¹?å¾?"
-
-#: ../filter/filter.glade.h:14
-msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
-msgstr ""
-"ç§?\n"
-"å??\n"
-"æ??\n"
-"å¤©\n"
-"é?±\n"
-"æ??\n"
-"å¹´"
-
-#: ../filter/filter.glade.h:21
-msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
-msgstr ""
-"ç?®å??ç??æ??å?»\n"
-"ä½ æ??å®?ç??æ??å?»\n"
-"ç?¸å°?æ?¼ç?®å??æ??å?»ç??æ??å·®"
-
-#: ../filter/rule-editor.c:381
-msgid "Add Rule"
-msgstr "æ?°å¢?è¦?å??"
-
-#: ../filter/rule-editor.c:462
-msgid "Edit Rule"
-msgstr "ç·¨è¼¯è¦?å??"
-
-#: ../filter/rule-editor.c:808
-msgid "Rule name"
-msgstr "è¦?å??å??ç¨±"
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "é??æ¿¾å?¨è¦?å??(_F)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "é?µä»¶ç·¨è¼¯å?¨å??å¥½è¨å®?"
+#: ../filter/filter.ui.h:12
+msgid "a time relative to the current time"
+msgstr "ç?¸å°?æ?¼ç?®å??æ??å?»ç??æ??å·®"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr "å?¨æ¤è¨å®?é?µä»¶ç??å??å¥½è¨å®?ï¼?å??å?«å®?å?¨æ?§è??é?µä»¶ç??é¡¯ç¤º"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "å?¨æ¤è¨å®?æ?¼å?æª¢æ?¥ã??ç°½å??æª?è??é?µä»¶ç·¨è¼¯å?¨"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "å?¨æ¤è¨å®?ä½ ç??é?µä»¶å¸³è??"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "å?¨æ¤è¨å®?ä½ ç??ç¶²çµ¡é?£ç·?è¨å®?å?¼"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution é?µä»¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution é?µä»¶å¸³è??çµ?æ??æ?§å?¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution é?µä»¶é??ä»¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution é?µä»¶æ?°å¯«å?¨"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution é?µä»¶æ?°å¯«å?¨çµ?æ??æ?§å?¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution é?µä»¶å?ªå??è¨å®?æ?§å?¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "Evolution ç¶²çµ¡çµ?æ??æ?§å?¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/em-folder-view.c:602
-#: ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:620
-#: ../mail/mail-component.c:621
-#: ../mail/mail-component.c:793
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "é?µä»¶"
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "å??"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:490
-msgid "Mail Accounts"
-msgstr "é?µä»¶å¸³è??"
+#: ../filter/filter.ui.h:16
+msgid "in the future"
+msgstr "å¾?"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:108
-msgid "Mail Preferences"
-msgstr "é?µä»¶å??å¥½è¨å®?"
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "å??æ??"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "ç¶²çµ¡å??å¥½è¨å®?"
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+msgid "seconds"
+msgstr "ç§?"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:297
-msgid "_Mail"
-msgstr "é?µä»¶(_M)"
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "ç?®å??ç??æ??å?»"
 
-#: ../mail/e-attachment-handler-mail.c:133
-#: ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:501
-#: ../ui/evolution-mail-message.xml.h:105
-msgid "_Forward"
-msgstr "è½?å¯?(_F)"
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "ä½ æ??å®?ç??æ??å?»"
 
-#: ../mail/e-attachment-handler-mail.c:147
-#: ../mail/em-folder-view.c:1329
-#: ../ui/evolution-mail-message.xml.h:123
-msgid "_Reply to Sender"
-msgstr "å??è¦?å¯?ä»¶è??(_R)"
+#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:498
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:519
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-source.c:742
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "é?±"
 
-#. Translators: This is only for multiple messages.
-#: ../mail/e-attachment-handler-mail.c:334
-#, c-format
-msgid "%d attached messages"
-msgstr "%d å??é??å? ç??é?µä»¶"
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:122
-#: ../mail/em-format-html-display.c:1642
-#: ../mail/message-list.etspec.h:1
+#: ../mail/e-mail-attachment-bar.c:119 ../mail/em-format-html-display.c:1025
+#: ../mail/mail-config.ui.h:13 ../mail/message-list.etspec.h:1
 #: ../widgets/misc/e-attachment-paned.c:147
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??ä»¶"
 msgstr[1] "é??ä»¶"
 
-#: ../mail/e-mail-attachment-bar.c:615
+#: ../mail/e-mail-attachment-bar.c:612
 #: ../widgets/misc/e-attachment-paned.c:607
 msgid "Icon View"
 msgstr "å??ç¤ºæª¢è¦?"
 
-#: ../mail/e-mail-attachment-bar.c:616
+#: ../mail/e-mail-attachment-bar.c:613
 #: ../widgets/misc/e-attachment-paned.c:608
 msgid "List View"
 msgstr "æ¸?å?®æª¢è¦?"
 
-#: ../mail/e-mail-search-bar.c:76
+#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:628
+msgid "Focus Tracker"
+msgstr "ç?¦é»?è¿½è¹¤å?¨"
+
+#: ../mail/e-mail-browser.c:739
+msgid "Shell Module"
+msgstr "Shell æ¨¡çµ?"
+
+#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
+msgid "The mail shell backend"
+msgstr "é?µä»¶ shell å¾?ç«¯ç¨?å¼?"
+
+#: ../mail/e-mail-browser.c:750
+msgid "Show Deleted"
+msgstr "é¡¯ç¤ºå·²å?ªé?¤"
+
+#: ../mail/e-mail-browser.c:751
+msgid "Show deleted messages"
+msgstr "é¡¯ç¤ºå·²å?ªé?¤é?µä»¶"
+
+#: ../mail/e-mail-display.c:66
+msgid "_Add to Address Book..."
+msgstr "å? å?¥å?°é??è¨?é??(_A)..."
+
+#: ../mail/e-mail-display.c:73
+msgid "_To This Address"
+msgstr "å?°é??å??ä½?å??(_T)"
+
+#: ../mail/e-mail-display.c:80
+msgid "_From This Address"
+msgstr "å¾?é??å??ä½?å??(_F)"
+
+#: ../mail/e-mail-display.c:89
+msgid "Create Search _Folder"
+msgstr "å»ºç«?æ??å°?è³?æ??å¤¾(_F)"
+
+#: ../mail/e-mail-label-dialog.c:220
+msgid "_Label name:"
+msgstr "æ¨?ç±¤å??ç¨±(_L):"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "é??è¦?(_M)"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "å·¥ä½?(_W)"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "å??äºº(_P)"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "å¾?è¾¦äº?é ?(_T)"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "ç¨?å¾?(_L)"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:505
+msgid "Add Label"
+msgstr "å? å?¥æ¨?ç±¤"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "ç·¨è¼¯æ¨?ç±¤"
+
+#: ../mail/e-mail-label-manager.c:349
+msgid ""
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr ""
+"æ³¨æ??ï¼?å?¨æ¨?ç±¤å??ç¨±ä¸ç??åº?ç·?æ?¯ç?¨ä¾?\n"
+"æ¨?è¨?é?¸å?®ä¸ç??æ?·å¾?é?µã??"
+
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "é¡?è?²"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2570
+#: ../modules/mail/e-mail-shell-view-private.c:908
+msgid "Inbox"
+msgstr "æ?¶ä»¶å?£"
+
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
+msgid "Drafts"
+msgstr "è??ç¨¿"
+
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
+msgid "Outbox"
+msgstr "å¯?ä»¶å?£"
+
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
+msgid "Sent"
+msgstr "å·²å?³é??"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:574
+msgid "Templates"
+msgstr "ç¯?æ?¬"
+
+#: ../mail/e-mail-migrate.c:953 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "é??è¦?"
+
+#. green
+#: ../mail/e-mail-migrate.c:956
+msgid "To Do"
+msgstr "å¾?è¾¦"
+
+#. blue
+#: ../mail/e-mail-migrate.c:957
+msgid "Later"
+msgstr "ç¨?å¾?"
+
+#: ../mail/e-mail-migrate.c:1103
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+msgid "Migrating..."
+msgstr "æ£å?¨ç§»è½?..."
+
+#: ../mail/e-mail-migrate.c:1136
+msgid "Migration"
+msgstr "ç§»è½?"
+
+#: ../mail/e-mail-migrate.c:1176
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
 #, c-format
-msgid "Matches: %d"
-msgstr "ç¬¦å??ï¼?%d"
+msgid "Migrating '%s':"
+msgstr "æ£å?¨ç§»è½?ã??%sã??ï¼?"
 
-#: ../mail/e-mail-search-bar.c:520
-msgid "Close the find bar"
-msgstr "é??é??æ??å°?å·¥å?·å??"
+#: ../mail/e-mail-migrate.c:1586
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "ç?¡æ³?å»ºç«?æ?°è³?æ??å¤¾ `%s'ï¼?%s"
 
-#: ../mail/e-mail-search-bar.c:528
-msgid "Fin_d:"
-msgstr "å°?æ?¾(_D):"
+#: ../mail/e-mail-migrate.c:1614
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "ç?¡æ³?è¤?è£½è£½è³?æ??å¤¾ `%s' è?³ `%s'ï¼?%s"
 
-#: ../mail/e-mail-search-bar.c:540
-msgid "Clear the search"
-msgstr "æ¸?é?¤æ¤æ??å°?"
+#: ../mail/e-mail-migrate.c:1809
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
 
-#: ../mail/e-mail-search-bar.c:559
-msgid "_Previous"
-msgstr "ä¸?ä¸?å??(_P)"
+#: ../mail/e-mail-migrate.c:1815 ../mail/e-mail-migrate.c:2912
+msgid "Migrating Folders"
+msgstr "æ£å?¨è½?ç§»è³?æ??å¤¾"
 
-#: ../mail/e-mail-search-bar.c:565
-msgid "Find the previous occurrence of the phrase"
-msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
+#: ../mail/e-mail-migrate.c:1816
+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 ""
+"Evolution ä¿¡ç®±è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±æ?´æ?¹äº?ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../mail/e-mail-search-bar.c:573
-msgid "_Next"
-msgstr "ä¸?ä¸?å??(_N)"
+#: ../mail/e-mail-migrate.c:2019
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/e-mail-search-bar.c:579
-msgid "Find the next occurrence of the phrase"
-msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
+#: ../mail/e-mail-migrate.c:2035
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "ç?¡æ³?å»ºç«? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
 
-#: ../mail/e-mail-search-bar.c:587
-msgid "Mat_ch case"
-msgstr "å??å??å¤§å°?å¯«(_C)"
+#: ../mail/e-mail-migrate.c:2067
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "ç?¡æ³?è¤?è£½ POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/e-mail-search-bar.c:615
-msgid "Reached bottom of page, continued from top"
-msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?ç«¯ç¹¼çº?"
+#: ../mail/e-mail-migrate.c:2538 ../mail/e-mail-migrate.c:2552
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "ç?¡æ³?å»ºç«?æ?¬å?°é?µä»¶å?²å?å?? `%s':%s"
 
-#: ../mail/e-mail-search-bar.c:637
-msgid "Reached top of page, continued from bottom"
-msgstr "å?°é??é ?é?¢é ?ç«¯ï¼?å¾?åº?é?¨ç¹¼çº?"
+#: ../mail/e-mail-migrate.c:2913
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution ä¿¡ç®±è³?æ??å¤¾ç??æ??è¦?æ ¼å¼?å¾? Evolution 2.24 å¾?è½?æ??ç?º SQLiteã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-migrate.c:2928 ../mail/e-mail-store.c:229
+#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
+#: ../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
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "æ??ç??é?»è?¦"
+
+#: ../mail/e-mail-migrate.c:3008
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "ç?¡æ³?å?¨ `%s' å»ºç«?æ?¬å?°é?µä»¶è³?æ??å¤¾:%s"
+
+#: ../mail/e-mail-migrate.c:3026
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr "ç?¡æ³?å¾?ä»¥å??ç?? Evolution è®?å??è¨å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å?å?¨æ??æ??æ¯?ã??"
+
+#. 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:580
+msgid "Do not ask me again"
+msgstr "ä¸?è¦?å??è©¢å??æ??"
+
+#: ../mail/e-mail-reader.c:194 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "è¤?è£½è?³è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:194 ../mail/em-folder-utils.c:382
+msgid "C_opy"
+msgstr "è¤?è£½(_O)"
+
+#: ../mail/e-mail-reader.c:568 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "ç§»è?³è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:568 ../mail/em-folder-utils.c:382
+msgid "_Move"
+msgstr "ç§»å??(_M)"
+
+#: ../mail/e-mail-reader.c:794
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "å?²å?é?µä»¶"
+msgstr[1] "å?²å?é?µä»¶"
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:815 ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:518
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "é?µä»¶"
+msgstr[1] "é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1073
+msgid "A_dd Sender to Address Book"
+msgstr "å? å?¥å¯?ä»¶è??å?°ç?®é??æ??å??(_D)"
+
+#: ../mail/e-mail-reader.c:1075
+msgid "Add sender to address book"
+msgstr "æ?°å¢?å¯?ä»¶è??è?³é??è¨?é??"
+
+#: ../mail/e-mail-reader.c:1080
+msgid "Check for _Junk"
+msgstr "æª¢æ?¥å??å?¾é?µä»¶(_J)"
+
+#: ../mail/e-mail-reader.c:1082
+msgid "Filter the selected messages for junk status"
+msgstr "ç¯©é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
+
+#: ../mail/e-mail-reader.c:1087
+msgid "_Copy to Folder..."
+msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)..."
+
+#: ../mail/e-mail-reader.c:1089
+msgid "Copy selected messages to another folder"
+msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1094
+msgid "_Delete Message"
+msgstr "å?ªé?¤é?µä»¶(_D)"
+
+#: ../mail/e-mail-reader.c:1096
+msgid "Mark the selected messages for deletion"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??è¦?å?ªé?¤"
+
+#: ../mail/e-mail-reader.c:1101
+msgid "Filter on Mailing _List..."
+msgstr "é??ä¿¡è«?å£?é??æ¿¾å?¨(_L)..."
+
+#: ../mail/e-mail-reader.c:1103
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨è¦?å??"
+
+#: ../mail/e-mail-reader.c:1108
+msgid "Filter on _Recipients..."
+msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_R)..."
+
+#: ../mail/e-mail-reader.c:1110
+msgid "Create a rule to filter messages to these recipients"
+msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
+
+#: ../mail/e-mail-reader.c:1115
+msgid "Filter on Se_nder..."
+msgstr "å¯?ä»¶è??é??æ¿¾å?¨(_N)..."
+
+#: ../mail/e-mail-reader.c:1117
+msgid "Create a rule to filter messages from this sender"
+msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
+
+#: ../mail/e-mail-reader.c:1122
+msgid "Filter on _Subject..."
+msgstr "ä¸»æ?¨é??æ¿¾å?¨(_S)..."
+
+#: ../mail/e-mail-reader.c:1124
+msgid "Create a rule to filter messages with this subject"
+msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?é??æ¿¾å?¨è¦?å??"
+
+#: ../mail/e-mail-reader.c:1129
+msgid "A_pply Filters"
+msgstr "å¥?ç?¨é??æ¿¾å?¨(_P)"
+
+#: ../mail/e-mail-reader.c:1131
+msgid "Apply filter rules to the selected messages"
+msgstr "å¥?ç?¨é??æ¿¾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1136
+msgid "_Find in Message..."
+msgstr "å?¨é?µä»¶å?§å°?æ?¾(_F)..."
+
+#: ../mail/e-mail-reader.c:1138
+msgid "Search for text in the body of the displayed message"
+msgstr "æ??å°?é¡¯ç¤ºç??é?µä»¶æ?¬æ??ä¸ç??æ??å?"
+
+#: ../mail/e-mail-reader.c:1143
+msgid "_Clear Flag"
+msgstr "æ¸?é?¤æ¨?å¹?(_C)"
+
+#: ../mail/e-mail-reader.c:1145
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "ç§»é?¤é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?"
+
+#: ../mail/e-mail-reader.c:1150
+msgid "_Flag Completed"
+msgstr "æ¨?è¨?ç?ºå·²å®?æ??(_F)"
+
+#: ../mail/e-mail-reader.c:1152
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "å°?å·²é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?è¨ç?ºå·²å®?æ??"
+
+#: ../mail/e-mail-reader.c:1157
+msgid "Follow _Up..."
+msgstr "è·?é?¨(_U)..."
+
+#: ../mail/e-mail-reader.c:1159
+msgid "Flag the selected messages for follow-up"
+msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ??æ¨?"
+
+#: ../mail/e-mail-reader.c:1164
+msgid "_Attached"
+msgstr "é??ä»¶(_A)"
+
+#: ../mail/e-mail-reader.c:1166 ../mail/e-mail-reader.c:1173
+msgid "Forward the selected message to someone as an attachment"
+msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??ä»¶å½¢å¼?è½?å¯?çµ¦æ??äºº"
+
+#: ../mail/e-mail-reader.c:1171
+msgid "Forward As _Attached"
+msgstr "ä»¥é??ä»¶è½?å¯?(_A)"
+
+#: ../mail/e-mail-reader.c:1178
+msgid "_Inline"
+msgstr "è¡?å?§(_I)"
+
+#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
+msgid "Forward the selected message in the body of a new message"
+msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??ä¸"
+
+#: ../mail/e-mail-reader.c:1185
+msgid "Forward As _Inline"
+msgstr "ä»¥è¡?å?§è½?å¯?(_I)"
+
+#: ../mail/e-mail-reader.c:1192
+msgid "_Quoted"
+msgstr "å¼?æ??(_Q)"
+
+#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
+msgid "Forward the selected message quoted like a reply"
+msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
+
+#: ../mail/e-mail-reader.c:1199
+msgid "Forward As _Quoted"
+msgstr "ä»¥å¼?æ??è½?å¯?(_Q)"
+
+#: ../mail/e-mail-reader.c:1206
+msgid "_Load Images"
+msgstr "è¼?å?¥å??ç??(_L)"
+
+#: ../mail/e-mail-reader.c:1208
+msgid "Force images in HTML mail to be loaded"
+msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
+
+#: ../mail/e-mail-reader.c:1213
+msgid "_Important"
+msgstr "é??è¦?(_I)"
+
+#: ../mail/e-mail-reader.c:1215
+msgid "Mark the selected messages as important"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??é??è¦?"
+
+#: ../mail/e-mail-reader.c:1220
+msgid "_Junk"
+msgstr "å??å?¾é?µä»¶(_J)"
+
+#: ../mail/e-mail-reader.c:1222
+msgid "Mark the selected messages as junk"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å??å?¾é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1227
+msgid "_Not Junk"
+msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
+
+#: ../mail/e-mail-reader.c:1229
+msgid "Mark the selected messages as not being junk"
+msgstr "å°?é?¸å??ç??é?µä»¶æ¨?ç¤ºæ??ä¸?æ?¯å??å?¾é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1234
+msgid "_Read"
+msgstr "å·²é?±è®?(_R)"
+
+#: ../mail/e-mail-reader.c:1236
+msgid "Mark the selected messages as having been read"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å·²ç¶?é?±è®?"
+
+#: ../mail/e-mail-reader.c:1241
+msgid "Uni_mportant"
+msgstr "ä¸?é??è¦?(_M)"
+
+#: ../mail/e-mail-reader.c:1243
+msgid "Mark the selected messages as unimportant"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??ä¸?é??è¦?"
+
+#: ../mail/e-mail-reader.c:1248
+msgid "_Unread"
+msgstr "æ?ªé?±è®?(_U)"
+
+#: ../mail/e-mail-reader.c:1250
+msgid "Mark the selected messages as not having been read"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??æ?ªé?±è®?"
+
+#: ../mail/e-mail-reader.c:1255
+msgid "_Edit as New Message..."
+msgstr "ç·¨è¼¯ç?ºæ?°é?µä»¶(_E)..."
+
+#: ../mail/e-mail-reader.c:1257
+msgid "Open the selected messages in the composer for editing"
+msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
+
+#: ../mail/e-mail-reader.c:1262
+msgid "Compose _New Message"
+msgstr "æ?°å¯«æ?°é?µä»¶(_N)"
+
+#: ../mail/e-mail-reader.c:1264
+msgid "Open a window for composing a mail message"
+msgstr "é??å??è¦?çª?ä»¥ä¾¿æ?°å¯«é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1269
+msgid "_Open in New Window"
+msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
+
+#: ../mail/e-mail-reader.c:1271
+msgid "Open the selected messages in a new window"
+msgstr "ä½¿ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1276
+msgid "_Move to Folder..."
+msgstr "ç§»è?³è³?æ??å¤¾(_M)..."
+
+#: ../mail/e-mail-reader.c:1278
+msgid "Move selected messages to another folder"
+msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1283
+msgid "_Next Message"
+msgstr "ä¸?ä¸?å°?é?µä»¶(_N)"
+
+#: ../mail/e-mail-reader.c:1285
+msgid "Display the next message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1290
+msgid "Next _Important Message"
+msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
+
+#: ../mail/e-mail-reader.c:1292
+msgid "Display the next important message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1297
+msgid "Next _Thread"
+msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
+
+#: ../mail/e-mail-reader.c:1299
+msgid "Display the next thread"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?ç?¸é??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1304
+msgid "Next _Unread Message"
+msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
+
+#: ../mail/e-mail-reader.c:1306
+msgid "Display the next unread message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1311
+msgid "_Previous Message"
+msgstr "ä¸?ä¸?å°?é?µä»¶(_P)"
+
+#: ../mail/e-mail-reader.c:1313
+msgid "Display the previous message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1318
+msgid "Pr_evious Important Message"
+msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
+
+#: ../mail/e-mail-reader.c:1320
+msgid "Display the previous important message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1325
+msgid "P_revious Unread Message"
+msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
+
+#: ../mail/e-mail-reader.c:1327
+msgid "Display the previous unread message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
+
+# zh_HK: msgstr "å??å?°é?µä»¶"
+#: ../mail/e-mail-reader.c:1334
+msgid "Print this message"
+msgstr "å??å?°é?µä»¶"
+
+# zh_HK: msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
+#: ../mail/e-mail-reader.c:1341
+msgid "Preview the message to be printed"
+msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1346
+msgid "Re_direct"
+msgstr "é??æ?°å°?å??(_D)"
+
+#: ../mail/e-mail-reader.c:1348
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??çµ¦æ??äºº"
+
+#: ../mail/e-mail-reader.c:1353
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "å??è¦?æ??æ??äºº(_A)"
+
+#: ../mail/e-mail-reader.c:1355
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "æ?°å¯«å??é?µçµ¦å·²é?¸å??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
+
+#: ../mail/e-mail-reader.c:1360
+msgid "Reply to _List"
+msgstr "å??è¦?è?³æ¸?å?®(_L)"
+
+#: ../mail/e-mail-reader.c:1362
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
+
+#: ../mail/e-mail-reader.c:1367
+#: ../modules/mail/e-mail-attachment-handler.c:148
+msgid "_Reply to Sender"
+msgstr "å??è¦?å¯?ä»¶è??(_R)"
+
+#: ../mail/e-mail-reader.c:1369
+msgid "Compose a reply to the sender of the selected message"
+msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?ä»¶è??"
+
+#: ../mail/e-mail-reader.c:1374
+msgid "_Save as mbox..."
+msgstr "å?²å?æ?? mbox(_S)..."
+
+#: ../mail/e-mail-reader.c:1376
+msgid "Save selected messages as an mbox file"
+msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å?æ?? mbox æª?æ¡?"
+
+#: ../mail/e-mail-reader.c:1381
+msgid "Search Folder from Mailing _List..."
+msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??å¤¾(_L)..."
+
+#: ../mail/e-mail-reader.c:1383
+msgid "Create a search folder for this mailing list"
+msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1388
+msgid "Search Folder from Recipien_ts..."
+msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??å¤¾(_T)..."
+
+#: ../mail/e-mail-reader.c:1390
+msgid "Create a search folder for these recipients"
+msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1395
+msgid "Search Folder from Sen_der..."
+msgstr "å¯?ä»¶è??æ??å°?è³?æ??å¤¾(_D)..."
+
+#: ../mail/e-mail-reader.c:1397
+msgid "Create a search folder for this sender"
+msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1402
+msgid "Search Folder from S_ubject..."
+msgstr "ä¸»æ?¨æ??å°?è³?æ??å¤¾(_U)..."
+
+#: ../mail/e-mail-reader.c:1404
+msgid "Create a search folder for this subject"
+msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1409
+msgid "_Message Source"
+msgstr "é?µä»¶ä¾?æº?(_M)"
+
+#: ../mail/e-mail-reader.c:1411
+msgid "Show the raw email source of the message"
+msgstr "é¡¯ç¤ºé?µä»¶å??å§?æª?"
+
+#: ../mail/e-mail-reader.c:1423
+msgid "_Undelete Message"
+msgstr "å¾©å??å?ªé?¤é?µä»¶(_U)"
+
+#: ../mail/e-mail-reader.c:1425
+msgid "Undelete the selected messages"
+msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1430
+msgid "_Normal Size"
+msgstr "æ£å¸¸å¤§å°?(_N)"
+
+#: ../mail/e-mail-reader.c:1432
+msgid "Reset the text to its original size"
+msgstr "é??è¨æ??å?ç?ºå??å§?å¤§å°?"
+
+#: ../mail/e-mail-reader.c:1437
+msgid "_Zoom In"
+msgstr "æ??è¿?(_Z)"
+
+#: ../mail/e-mail-reader.c:1439
+msgid "Increase the text size"
+msgstr "å°?æ??å?æ?¾å¤§"
+
+#: ../mail/e-mail-reader.c:1444
+msgid "Zoom _Out"
+msgstr "æ??é? (_O)"
+
+#: ../mail/e-mail-reader.c:1446
+msgid "Decrease the text size"
+msgstr "å°?æ??å?ç¸®å°?"
+
+#: ../mail/e-mail-reader.c:1453
+msgid "Create R_ule"
+msgstr "å»ºç«?è¦?å??(_U)"
+
+#: ../mail/e-mail-reader.c:1460
+msgid "Ch_aracter Encoding"
+msgstr "å?ç¬¦ç·¨ç¢¼(_A)"
+
+#: ../mail/e-mail-reader.c:1467
+msgid "F_orward As"
+msgstr "è½?å¯?ç?º(_O)"
+
+#: ../mail/e-mail-reader.c:1474
+msgid "_Go To"
+msgstr "ç§»è?³(_G)"
+
+#: ../mail/e-mail-reader.c:1481
+msgid "Mar_k As"
+msgstr "æ¨?ç¤ºæ??(_K)"
+
+#: ../mail/e-mail-reader.c:1488
+msgid "_Message"
+msgstr "é?µä»¶(_M)"
+
+#: ../mail/e-mail-reader.c:1495
+msgid "_Zoom"
+msgstr "ç¸®æ?¾(_Z)"
+
+#: ../mail/e-mail-reader.c:1520
+msgid "Mark for Follo_w Up..."
+msgstr "æ¨?ç¤ºç?ºè·?é?¨(_W)..."
+
+#: ../mail/e-mail-reader.c:1528
+msgid "Mark as _Important"
+msgstr "æ¨?ç¤ºæ??é??è¦?(_I)"
+
+#: ../mail/e-mail-reader.c:1532
+msgid "Mark as _Junk"
+msgstr "æ¨?ç¤ºæ??å??å?¾é?µä»¶(_J)"
+
+#: ../mail/e-mail-reader.c:1536
+msgid "Mark as _Not Junk"
+msgstr "æ¨?ç¤ºæ??é??å??å?¾é?µä»¶(_N)"
+
+#: ../mail/e-mail-reader.c:1540
+msgid "Mar_k as Read"
+msgstr "æ¨?ç¤ºæ??å·²é?±è®?(_K)"
+
+#: ../mail/e-mail-reader.c:1544
+msgid "Mark as Uni_mportant"
+msgstr "æ¨?ç¤ºæ??ä¸?é??è¦?(_M)"
+
+#: ../mail/e-mail-reader.c:1548
+msgid "Mark as _Unread"
+msgstr "æ¨?ç¤ºæ??æ?ªé?±è®?(_U)"
+
+#: ../mail/e-mail-reader.c:1584
+msgid "_Caret Mode"
+msgstr "æ¼?å?æ¨¡å¼?(_C)"
+
+#: ../mail/e-mail-reader.c:1586
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??ä¸é¡¯ç¤ºé??ç??æ¸¸æ¨?"
+
+#: ../mail/e-mail-reader.c:1592
+msgid "All Message _Headers"
+msgstr "æ??æ??é?µä»¶æª?é (_H)"
+
+#: ../mail/e-mail-reader.c:1594
+msgid "Show messages with all email headers"
+msgstr "é¡¯ç¤ºé?µä»¶å??è©³ç´°æª?é "
+
+#: ../mail/e-mail-reader.c:1813
+msgid "Unable to retrieve message"
+msgstr "ç?¡æ³?æ?¥æ?¶é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1858 ../mail/mail-ops.c:1849
+#, 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:2352
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:612
+#: ../plugins/google-account-setup/google-source.c:783
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "é ?è¨å?¼"
+
+#: ../mail/e-mail-reader.c:2471
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "è½?å¯?(_F)"
+
+#: ../mail/e-mail-reader.c:2472
+msgid "Forward the selected message to someone"
+msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?çµ¦æ??äºº"
+
+#: ../mail/e-mail-reader.c:2516 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
+msgid "Delete"
+msgstr "å?ªé?¤"
+
+#: ../mail/e-mail-reader.c:2520
+#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "ä¸?ä¸?å??"
+
+#: ../mail/e-mail-reader.c:2524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "ä¸?ä¸?å??"
+
+#: ../mail/e-mail-reader.c:2528 ../mail/mail-dialogs.ui.h:18
+msgid "Reply"
+msgstr "å??è¦?"
+
+#: ../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:309
+#: ../mail/em-account-editor.c:484 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:10
 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:313
+#: ../mail/em-account-editor.c:488 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:21
 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:317
+#: ../mail/em-account-editor.c:492 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL å? å¯?"
 
-#: ../mail/em-account-editor.c:408
+#: ../mail/em-account-editor.c:579
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s æ??æ¬?å??ç´?"
 
-#: ../mail/em-account-editor.c:415
+#: ../mail/em-account-editor.c:586
 #, c-format
 msgid ""
 "\n"
@@ -10542,144 +9893,167 @@ msgstr ""
 " %s æ??æ¬?å??ç´?\n"
 "ä¸¦é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
 
-#: ../mail/em-account-editor.c:487
-#: ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "é?¸æ??è³?æ??å¤¾"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:866 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:797
+#: ../mail/em-account-editor.c:949
 msgid "Never"
 msgstr "æ°¸ä¸?"
 
-#: ../mail/em-account-editor.c:798
+#: ../mail/em-account-editor.c:950
 msgid "Always"
 msgstr "æ°¸é? "
 
-#: ../mail/em-account-editor.c:799
+#: ../mail/em-account-editor.c:951
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
-#: ../mail/em-account-editor.c:1877
-#: ../mail/mail-config.glade.h:100
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1683 ../widgets/misc/e-account-tree-view.c:124
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../mail/em-account-editor.c:2039
+msgid "Mail Configuration"
+msgstr "é?µä»¶çµ?æ??"
+
+#: ../mail/em-account-editor.c:2040
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"æ¡è¿?ä½¿ç?¨ Evolution é?µä»¶çµ?æ??å?©ç??ã??\n"
+"\n"
+"æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
+
+#: ../mail/em-account-editor.c:2042 ../mail/em-account-editor.c:2178
+#: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "èº«å??"
 
-#: ../mail/em-account-editor.c:1928
-#: ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:2043
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr "è«?å?¨ä¸?é?¢è¼¸å?¥ä½ ç??å??ç¨±å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??ä½ å¸?æ??å?¨é??å?ºç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
+
+#: ../mail/em-account-editor.c:2045 ../mail/em-account-editor.c:2215
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2216
+#: ../mail/em-account-editor.c:2046
+msgid "Please configure the following account settings."
+msgstr "è«?å?¨è¨å®?ä¸?å??å¸³è??ç??è¨å®?å?¼ã??"
+
+#: ../mail/em-account-editor.c:2048 ../mail/em-account-editor.c:2692
+msgid "Sending Email"
+msgstr "å?³é??é?»å?é?µä»¶"
+
+#: ../mail/em-account-editor.c:2049
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr "è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??ä½ ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²çµ¡æ??å??ä¾?æ??å??ã??"
+
+#: ../mail/em-account-editor.c:2051
+msgid "Account Management"
+msgstr "å¸³è??ç¸½ç®¡"
+
+#: ../mail/em-account-editor.c:2052
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"è«?å?¨ä¸?é?¢ç??ç©ºé??è¼¸å?¥æ??è¿°é??å??å¸³è??ç??å??ç¨±ã??\n"
+"é??å??å??ç¨±å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
+
+#: ../mail/em-account-editor.c:2056
+msgid "Done"
+msgstr "å®?æ??"
+
+#: ../mail/em-account-editor.c:2057
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"æ?å??ä½ ï¼?é?µä»¶è¨å®?å·²ç¶?å®?æ??ã??\n"
+"\n"
+"ä½ ç?¾å?¨å?¯ä»¥é??å§?ä½¿ç?¨ Evolution æ?¶ç?¼é?»å?é?µä»¶ã??\n"
+"\n"
+"è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å?è¨å®?ã??"
+
+#: ../mail/em-account-editor.c:2502
 msgid "Check for _new messages every"
 msgstr "è?ªå??æª¢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2224
+#: ../mail/em-account-editor.c:2510
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2420
-#: ../mail/mail-config.glade.h:138
-msgid "Sending Email"
-msgstr "å?³é??é?»å?é?µä»¶"
-
-#: ../mail/em-account-editor.c:2479
-#: ../mail/mail-config.glade.h:73
+#: ../mail/em-account-editor.c:2756 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "é ?è¨å?¼"
 
-#. Security settings
-#: ../mail/em-account-editor.c:2545
-#: ../mail/mail-config.glade.h:133
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../mail/em-account-editor.c:2818 ../mail/mail-config.ui.h:100
 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:2582
-#: ../mail/em-account-editor.c:2677
+#: ../mail/em-account-editor.c:2855 ../mail/em-account-editor.c:2923
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é?¸é ?"
 
-#: ../mail/em-account-editor.c:2583
-#: ../mail/em-account-editor.c:2678
+#: ../mail/em-account-editor.c:2856 ../mail/em-account-editor.c:2924
 msgid "Checking for New Messages"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
-#: ../mail/em-account-editor.c:3145
-#: ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3391
 msgid "Account Editor"
 msgstr "å¸³è??ç·¨è¼¯å?¨"
 
-#: ../mail/em-account-editor.c:3145
-#: ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3391
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸³è??å?©ç??"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:426
-msgid "[Default]"
-msgstr "[é ?è¨å?¼]"
-
-#: ../mail/em-account-prefs.c:483
-msgid "Account name"
-msgstr "å¸³è??å??ç¨±"
-
-#: ../mail/em-account-prefs.c:485
-msgid "Protocol"
-msgstr "é??è¨?å??å®?"
-
-#: ../mail/em-composer-prefs.c:318
-#: ../mail/em-composer-prefs.c:452
-#: ../mail/mail-config.c:1160
-#: ../mail/mail-signature-editor.c:481
-msgid "Unnamed"
-msgstr "æ?ªå?½å??ç??"
-
-#: ../mail/em-composer-prefs.c:961
-msgid "Language(s)"
-msgstr "èª?è¨?"
-
-#: ../mail/em-composer-prefs.c:994
-msgid "Add signature script"
-msgstr "æ?°å¢?ç°½ç½²ç¨?åº?æª?"
-
-#: ../mail/em-composer-prefs.c:1036
-msgid "Signature(s)"
-msgstr "ç°½å??æª?"
-
-#: ../mail/em-composer-utils.c:1132
-#: ../mail/em-format-quote.c:415
-msgid "-------- Forwarded Message --------"
-msgstr "-------- è½?é??ç??é?µä»¶ --------"
-
-#: ../mail/em-composer-utils.c:1585
-msgid "No destination address provided, forward of the message has been cancelled."
-msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
-
-#: ../mail/em-composer-utils.c:1591
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??å¸³è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
-
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:1953
 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:2105
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+#: ../mail/em-composer-utils.c:2000
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} ${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2144
 msgid "-----Original Message-----"
 msgstr "-----å??å§?é?µä»¶-----"
 
-#: ../mail/em-filter-editor.c:172
-msgid "_Filter Rules"
-msgstr "é??æ¿¾å?¨è¦?å??(_F)"
+#: ../mail/em-composer-utils.c:2325
+msgid "Posting destination"
+msgstr "å¼µè²¼ç??ç?®ç??ç«¯"
+
+#: ../mail/em-composer-utils.c:2326
+msgid "Choose folders to post the message to."
+msgstr "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
+
+#: ../mail/em-filter-folder-element.c:258
+msgid "Select Folder"
+msgstr "é?¸æ??è³?æ??å¤¾"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -10702,10 +10076,6 @@ msgstr "å?¶è?²"
 msgid "Completed On"
 msgstr "å·²å®?æ??æ?¼"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "è¤?è£½è?³è³?æ??å¤¾"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "æ?¶ä»¶æ?¥æ??"
@@ -10714,16 +10084,6 @@ msgstr "æ?¶ä»¶æ?¥æ??"
 msgid "Date sent"
 msgstr "é??ä»¶æ?¥æ??"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:765
-#: ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "å?ªé?¤"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "å·²å?ªé?¤"
@@ -10772,11 +10132,6 @@ msgstr "è·?é?¨"
 msgid "Forward to"
 msgstr "è½?å¯?è?³"
 
-#: ../mail/em-filter-i18n.h:30
-#: ../mail/em-migrate.c:958
-msgid "Important"
-msgstr "é??è¦?"
-
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "æ?¯ä¹?å¾?ç??"
@@ -10801,9 +10156,7 @@ msgstr "æ?ªè¨å®?"
 msgid "is set"
 msgstr "è¨å®?"
 
-#: ../mail/em-filter-i18n.h:41
-#: ../mail/mail-config.glade.h:102
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
@@ -10843,10 +10196,6 @@ msgstr "é??å??å?¾é?µä»¶"
 msgid "Message Location"
 msgstr "é?µä»¶ä½?ç½®"
 
-#: ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "ç§»è?³è³?æ??å¤¾"
-
 #: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "å»ºç«?ç¨?å¼?ç®¡é??"
@@ -10855,14 +10204,12 @@ msgstr "å»ºç«?ç¨?å¼?ç®¡é??"
 msgid "Play Sound"
 msgstr "æ?æ?¾é?³æ??"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54
-#: ../mail/message-tag-followup.c:61
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "å·²è®?"
 
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "æ?¶ä»¶è??"
 
@@ -10890,13 +10237,11 @@ msgstr "å?³å??å°?æ?¼"
 msgid "Run Program"
 msgstr "å?·è¡?ç¨?å¼?"
 
-#: ../mail/em-filter-i18n.h:62
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "å??æ?¸"
 
-#: ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "å¯?ä»¶è??"
 
@@ -10936,78 +10281,19 @@ msgstr "ä»¥æ¤é??å§?"
 msgid "Stop Processing"
 msgstr "å??æ¢è??ç??"
 
-#: ../mail/em-filter-i18n.h:74
-#: ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:928
-#: ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:300
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1112
-msgid "Subject"
-msgstr "ä¸»æ?¨"
-
 #: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "å??æ¶?è¨å®?ç??æ??"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:530
 msgid "Then"
 msgstr "æ?¥ç??æ ¹æ??"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:561
 msgid "Add Ac_tion"
 msgstr "å? å?¥å??ä½?(_T)"
 
-#: ../mail/em-folder-browser.c:194
-msgid "C_reate Search Folder From Search..."
-msgstr "å¾?æ??å°?å»ºç«?æ??å°?è³?æ??å¤¾(_R)..."
-
-#: ../mail/em-folder-browser.c:219
-msgid "All Messages"
-msgstr "æ??æ??é?µä»¶"
-
-#: ../mail/em-folder-browser.c:220
-msgid "Unread Messages"
-msgstr "æ?ªè®?é?µä»¶"
-
-#: ../mail/em-folder-browser.c:222
-msgid "No Label"
-msgstr "ç?¡æ¨?ç±¤"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Read Messages"
-msgstr "å·²è®?é?µä»¶"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Recent Messages"
-msgstr "æ??è¿?ç??é?µä»¶"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Last 5 Days' Messages"
-msgstr "æ??è¿? 5 å¤©ç??é?µä»¶"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Messages with Attachments"
-msgstr "æ??é??å? æª?æ¡?ç??é?µä»¶"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Important Messages"
-msgstr "é??è¦?é?µä»¶"
-
-#: ../mail/em-folder-browser.c:234
-msgid "Messages Not Junk"
-msgstr "é??å??å?¾é?µä»¶"
-
-#: ../mail/em-folder-browser.c:1194
-msgid "Account Search"
-msgstr "å¸³è??æ??å°?"
-
-#: ../mail/em-folder-browser.c:1256
-msgid "All Account Search"
-msgstr "æ??æ??ç??å¸³è??æ??å°?"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -11033,74 +10319,47 @@ msgstr "é??é¡?ä½¿ç?¨é?? (%s):"
 msgid "Quota usage"
 msgstr "é??å?¶ç?¨é??"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359
-#: ../mail/em-folder-tree-model.c:517
-#: ../mail/em-folder-tree.c:2602
-#: ../mail/mail-component.c:168
-#: ../mail/mail-component.c:608
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "æ?¶ä»¶å?£"
-
-#: ../mail/em-folder-properties.c:390
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../mail/em-folder-properties.c:399
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "è³?æ??å¤¾å?§å®¹"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<æ??é??è£?é?¸æ??è³?æ??å¤¾>"
 
-#: ../mail/em-folder-selector.c:249
+#: ../mail/em-folder-selector.c:266
 msgid "C_reate"
 msgstr "å»ºç«?(_R)"
 
-#: ../mail/em-folder-selector.c:253
+#: ../mail/em-folder-selector.c:270
 msgid "Folder _name:"
 msgstr "è³?æ??å¤¾å??ç¨±(_N):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:195
-#: ../mail/em-folder-tree-model.c:197
-#: ../mail/mail-vfolder.c:960
-#: ../mail/mail-vfolder.c:1028
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "æ??å°?è³?æ??å¤¾"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:201
-#: ../mail/em-folder-tree-model.c:203
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
 msgid "UNMATCHED"
 msgstr "ä¸?ç¬¦å??"
 
-#: ../mail/em-folder-tree-model.c:510
-#: ../mail/mail-component.c:169
-msgid "Drafts"
-msgstr "è??ç¨¿"
-
-#: ../mail/em-folder-tree-model.c:513
-#: ../mail/mail-component.c:172
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "ç¯?æ?¬"
-
-#: ../mail/em-folder-tree-model.c:520
-#: ../mail/mail-component.c:170
-msgid "Outbox"
-msgstr "å¯?ä»¶å?£"
-
-#: ../mail/em-folder-tree-model.c:522
-#: ../mail/mail-component.c:171
-msgid "Sent"
-msgstr "å·²å?³é??"
-
-#: ../mail/em-folder-tree-model.c:580
-#: ../mail/em-folder-tree-model.c:889
+#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
 msgid "Loading..."
 msgstr "è¼?å?¥ä¸..."
 
+#: ../mail/em-folder-tree.c:188
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??å¤¾"
+
+#: ../mail/em-folder-tree.c:589
+msgid "Folder names cannot contain '/'"
+msgstr "è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«æ??ç·?ã??"
+
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. The first "%s" will be
 #. * replaced by the folder's name and "%u" will be replaced
@@ -11115,1585 +10374,1250 @@ msgstr "è¼?å?¥ä¸..."
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:318
+#: ../mail/em-folder-tree.c:1071
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:727
+#: ../mail/em-folder-tree.c:1277
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??å¤¾æ¨¹"
 
-#: ../mail/em-folder-tree.c:886
+#: ../mail/em-folder-tree.c:1477
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ£å?¨ç§»å??è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:1479
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ£å?¨è¤?è£½è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:895
-#: ../mail/message-list.c:2018
+#: ../mail/em-folder-tree.c:1486 ../mail/message-list.c:2103
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ£å?¨å°?é?µä»¶ç§»è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:897
-#: ../mail/message-list.c:2020
+#: ../mail/em-folder-tree.c:1488 ../mail/message-list.c:2105
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ£å?¨è¤?è£½é?µä»¶è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:912
+#: ../mail/em-folder-tree.c:1503
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?å±¤ç??å?²å?å??"
 
-#: ../mail/em-folder-tree.c:989
-#: ../ui/evolution-mail-message.xml.h:100
-msgid "_Copy to Folder"
-msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)"
-
-#: ../mail/em-folder-tree.c:990
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Move to Folder"
-msgstr "ç§»è?³è³?æ??å¤¾(_M)"
-
-#: ../mail/em-folder-tree.c:992
-#: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186
-#: ../mail/message-list.c:2110
-msgid "_Move"
-msgstr "ç§»å??(_M)"
-
-#: ../mail/em-folder-tree.c:994
-#: ../mail/message-list.c:2112
-msgid "Cancel _Drag"
-msgstr "å??æ¶?æ??æ??(_D)"
-
-#: ../mail/em-folder-tree.c:1702
-#: ../mail/mail-ops.c:1063
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??å¤¾"
-
-#: ../mail/em-folder-tree.c:2107
-msgid "Open in _New Window"
-msgstr "å?¨æ?°è¦?çª?é??å??(_N)"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2112
-msgid "_New Folder..."
-msgstr "æ?°å¢?è³?æ??å¤¾(_N)..."
-
-#: ../mail/em-folder-tree.c:2115
-msgid "_Move..."
-msgstr "ç§»å??(_M)..."
-
-#: ../mail/em-folder-tree.c:2123
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "é??æ?°æ?´ç??(_F)"
-
-#: ../mail/em-folder-tree.c:2124
-msgid "Fl_ush Outbox"
-msgstr "æ¸?ç??å¯?ä»¶å?£(_U)"
-
-#: ../mail/em-folder-tree.c:2129
-#: ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "æ¸?ç??å??æ?¶ç?(_E)"
-
-#: ../mail/em-folder-tree.c:2232
-msgid "_Unread Search Folder"
-msgstr "æ?ªè®?æ??å°?è³?æ??å¤¾(_U)"
-
-#: ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-utils.c:98
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "å°?ã??%sã??è¤?è£½å?°ã??%sã??"
 
-#: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
-msgid "Select folder"
-msgstr "é?¸æ??è³?æ??å¤¾"
+#: ../mail/em-folder-utils.c:383
+msgid "Move Folder To"
+msgstr "ç§»å??è³?æ??å¤¾å?°"
 
-#: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1201
-msgid "C_opy"
-msgstr "è¤?è£½(_O)"
+#: ../mail/em-folder-utils.c:383
+msgid "Copy Folder To"
+msgstr "è¤?è£½è³?æ??å¤¾å?°"
 
-#: ../mail/em-folder-utils.c:537
-#: ../plugins/groupwise-features/share-folder-common.c:144
+#: ../mail/em-folder-utils.c:496
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "æ£å?¨å»ºç«?è³?æ??å¤¾ `%s'"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:659
+msgid "Create Folder"
 msgstr "å»ºç«?è³?æ??å¤¾"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:660
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?å»ºç«?è³?æ??å¤¾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-folder-view.c:1089
-#: ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "å?ªé?¤é?µä»¶å¤±æ??"
-
-#: ../mail/em-folder-view.c:1090
-#: ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "ä½ æ²?æ??è¶³å¤ ç??æ¬?é??å?ªé?¤æ¤å°?é?µä»¶ã??"
-
-#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335
-#: ../ui/evolution-mail-message.xml.h:102
-msgid "_Edit as New Message..."
-msgstr "ç·¨è¼¯ç?ºæ?°é?µä»¶(_E)..."
-
-#: ../mail/em-folder-view.c:1341
-msgid "U_ndelete"
-msgstr "å¾©å??(_N)"
-
-#: ../mail/em-folder-view.c:1342
-msgid "_Move to Folder..."
-msgstr "ç§»è?³è³?æ??å¤¾(_M)..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "_Copy to Folder..."
-msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)..."
-
-#: ../mail/em-folder-view.c:1346
-msgid "Mar_k as Read"
-msgstr "æ¨?ç¤ºæ??å·²é?±è®?(_K)"
-
-#: ../mail/em-folder-view.c:1347
-msgid "Mark as _Unread"
-msgstr "æ¨?ç¤ºæ??æ?ªé?±è®?(_U)"
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mark as _Important"
-msgstr "æ¨?ç¤ºæ??é??è¦?(_I)"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as Un_important"
-msgstr "æ¨?ç¤ºæ??ä¸?é??è¦?(_I)"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as _Junk"
-msgstr "æ¨?ç¤ºæ??å??å?¾é?µä»¶(_J)"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as _Not Junk"
-msgstr "æ¨?ç¤ºæ??é??å??å?¾é?µä»¶(_N)"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark for Follo_w Up..."
-msgstr "æ¨?ç¤ºç?ºè·?é?¨(_W)..."
-
-#: ../mail/em-folder-view.c:1354
-msgid "_Label"
-msgstr "æ¨?ç±¤(_L)"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1355
-#: ../widgets/misc/e-dateedit.c:469
-msgid "_None"
-msgstr "æ²?æ??(_N)"
-
-#: ../mail/em-folder-view.c:1358
-msgid "_New Label"
-msgstr "æ?°å¢?æ¨?ç±¤(_N)"
-
-#: ../mail/em-folder-view.c:1362
-msgid "Fla_g Completed"
-msgstr "æ¨?å¹?å·²å®?æ??(_G)"
-
-#: ../mail/em-folder-view.c:1363
-msgid "Cl_ear Flag"
-msgstr "æ¸?é?¤æ¨?å¹?(_E)"
-
-#: ../mail/em-folder-view.c:1366
-msgid "Crea_te Rule From Message"
-msgstr "å¾?é?µä»¶å»ºç«?è¦?å??(_T)"
-
-#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
-msgid "Search Folder based on _Subject"
-msgstr "å¾?ä¸»æ?¨å»ºç«?æ??å°?è³?æ??å¤¾(_S)"
-
-#: ../mail/em-folder-view.c:1369
-msgid "Search Folder based on Se_nder"
-msgstr "å¾?å¯?ä»¶è??å»ºç«?æ??å°?è³?æ??å¤¾(_N)"
-
-#: ../mail/em-folder-view.c:1370
-msgid "Search Folder based on _Recipients"
-msgstr "å¾?æ?¶ä»¶è??å»ºç«?æ??å°?è³?æ??å¤¾(_R)"
-
-#: ../mail/em-folder-view.c:1371
-msgid "Search Folder based on Mailing _List"
-msgstr "å¾?é?µä»¶æ¸?å?®å»ºç«?æ??å°?è³?æ??å¤¾(_L)"
-
-#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
-msgid "Filter based on Sub_ject"
-msgstr "å¾?ä¸»æ?¨å»ºç«?é??æ¿¾å?¨(_J)"
-
-#: ../mail/em-folder-view.c:1377
-msgid "Filter based on Sen_der"
-msgstr "å¾?å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨(_D)"
-
-#: ../mail/em-folder-view.c:1378
-msgid "Filter based on Re_cipients"
-msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_C)"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on _Mailing List"
-msgstr "å¾?é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨(_M)"
-
-#. default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2232
-#: ../mail/em-folder-view.c:2275
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:613
-#: ../plugins/google-account-setup/google-source.c:784
-msgid "Default"
-msgstr "é ?è¨å?¼"
-
-#: ../mail/em-folder-view.c:2493
-msgid "Unable to retrieve message"
-msgstr "ç?¡æ³?æ?¥æ?¶é?µä»¶"
-
-#: ../mail/em-folder-view.c:2696
-msgid "Create _Search Folder"
-msgstr "å»ºç«?æ??å°?è³?æ??å¤¾(_S)"
-
-#: ../mail/em-folder-view.c:2697
-msgid "_From this Address"
-msgstr "å¾?é??å??ä½?å??(_F)"
-
-#: ../mail/em-folder-view.c:2698
-msgid "_To this Address"
-msgstr "å?°é??å??ä½?å??(_T)"
-
-#: ../mail/em-folder-view.c:3191
+#: ../mail/em-folder-utils.c:676
 #, c-format
-msgid "Click to mail %s"
-msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
-
-#: ../mail/em-folder-view.c:3203
-#, c-format
-msgid "Click to call %s"
-msgstr "æ??ä¸?ä¸?æ?è??çµ¦ %s"
-
-#: ../mail/em-folder-view.c:3208
-msgid "Click to hide/unhide addresses"
-msgstr "æ??é??è£?é?±è??/è§£é?¤é?±è??ä½?å??"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾ ã??%sã??"
 
-#: ../mail/em-format-html-display.c:560
-#: ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
 msgid "Unsigned"
 msgstr "æ?ªç°½ç½²"
 
-#: ../mail/em-format-html-display.c:560
-msgid "This message is not signed. There is no guarantee that this message is authentic."
+#: ../mail/em-format-html-display.c:103
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr "æ¤é?µä»¶æ?ªç°½ç½²ã??ä¸?ä¿?è?æ¤é?µä»¶å·²é©?è?ã??"
 
-#: ../mail/em-format-html-display.c:561
-#: ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
 msgid "Valid signature"
 msgstr "æ??æ??ç??ç°½ç½²"
 
-#: ../mail/em-format-html-display.c:561
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+#: ../mail/em-format-html-display.c:104
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr "æ¤é?µä»¶å·²ç°½ç½²è??ä¸?æ??æ??ï¼?è¡¨ç¤ºå®?é??å¸¸æ??å?¯è?½æ?¯é©?è?ç??é?µä»¶ã??"
 
-#: ../mail/em-format-html-display.c:562
-#: ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
 msgid "Invalid signature"
 msgstr "ç?¡æ??ç??ç°½ç½²"
 
-#: ../mail/em-format-html-display.c:562
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
+#: ../mail/em-format-html-display.c:105
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr "é?µä»¶ç??ç°½ç½²ç?¡æ³?æª¢é©?ï¼?å?¯è?½å·²å?¨å?³é??æ??è¢«æ?´å??äº?ã??"
 
-#: ../mail/em-format-html-display.c:563
-#: ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç°½ç½²æ??æ??ï¼?ä½?æ?¯ç?¡æ³?æª¢é©?å¯?ä»¶è??"
 
-#: ../mail/em-format-html-display.c:563
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+#: ../mail/em-format-html-display.c:106
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr "æ¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½ç½²ï¼?ä½?æ?¯é?µä»¶ç??å¯?ä»¶è??ç?¡æ³?æª¢é©?ã??"
 
-#: ../mail/em-format-html-display.c:564
-#: ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
 msgid "Signature exists, but need public key"
 msgstr "ç°½ç½²å?å?¨ï¼?ä½?é??è¦?å?¬é??å¯?ç¢¼å??"
 
-#: ../mail/em-format-html-display.c:564
-msgid "This message is signed with a signature, but there is no corresponding public key."
+#: ../mail/em-format-html-display.c:107
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
 msgstr "æ¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½ç½²ï¼?ä½?æ?¯æ²?æ??å°?æ??ç??å?¬é??å¯?ç¢¼å??ã??"
 
-#: ../mail/em-format-html-display.c:571
-#: ../mail/em-format-html.c:664
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
 msgid "Unencrypted"
 msgstr "æ?ªå? å¯?"
 
-#: ../mail/em-format-html-display.c:571
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+#: ../mail/em-format-html-display.c:114
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
 msgstr "æ¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??äº?è?¯ç¶²å?³é??å?¯è?½æ??è¢«æª¢é?±ã??"
 
-#: ../mail/em-format-html-display.c:572
-#: ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
 msgid "Encrypted, weak"
 msgstr "å·²å? å¯?ï¼?ä¸?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:572
-msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+#: ../mail/em-format-html-display.c:115
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
 msgstr "æ¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??äººå¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??æ?¥ï¼?ä¸¦ä¸?æ?¯ç?¡æ³?æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:573
-#: ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
 msgid "Encrypted"
 msgstr "å·²å? å¯?"
 
-#: ../mail/em-format-html-display.c:573
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+#: ../mail/em-format-html-display.c:116
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr "æ¤é?µä»¶å·²å? å¯?ã??å¤?é?¢ç??äººé?£ä»¥æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:574
-#: ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
 msgid "Encrypted, strong"
 msgstr "å·²å? å¯?ï¼?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:574
-msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+#: ../mail/em-format-html-display.c:117
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
 msgstr "æ¤é?µä»¶å·²å? å¯?ï¼?ä½¿ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??ç¸±ä½¿ç¶?é??ä¸?æ®µæ??é??ï¼?å¤?é?¢ç??äººå¾?é?£æª¢é?±æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:675
-#: ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æª¢è¦?è?æ?¸(_V)"
 
-#: ../mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "æ¤è?æ?¸ç?¡æ³?æª¢è¦?"
 
-#: ../mail/em-format-html-display.c:980
+#: ../mail/em-format-html-display.c:509
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr "Evolution ç?¡æ³?é¡¯ç¤ºæ¤å°?é?»å?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??ç??å¤§å°?ã??ä½ å?¯ä»¥ç?¨ä¸?æ??ç??ç??æ?¹å¼?æ??ä½¿ç?¨å¤?é?¨æ??å?ç·¨è¼¯å?¨ä¾?é?±è®?å®?ã??"
+
+#: ../mail/em-format-html-display.c:738
 msgid "Completed on"
 msgstr "å·²å®?æ??æ?¼"
 
-#: ../mail/em-format-html-display.c:988
+#: ../mail/em-format-html-display.c:746
 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:992
+#: ../mail/em-format-html-display.c:750
 msgid "by"
 msgstr "æ?¼"
 
-#: ../mail/em-format-html-display.c:1071
-#: ../widgets/misc/e-attachment-view.c:357
-msgid "_View Inline"
-msgstr "æª¢è¦?è¡?å?§(_V)"
-
-#: ../mail/em-format-html-display.c:1072
-#: ../widgets/misc/e-attachment-view.c:350
-msgid "_Hide"
-msgstr "é?±è??(_H)"
-
-#: ../mail/em-format-html-display.c:1073
-msgid "_Fit to Width"
-msgstr "ç¬¦å??é??åº¦(_F)"
-
-#: ../mail/em-format-html-display.c:1074
-msgid "Show _Original Size"
-msgstr "é¡¯ç¤ºå??å§?å¤§å°?(_O)"
-
-#: ../mail/em-format-html-display.c:1575
-#: ../mail/em-format-html-display.c:1614
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html-display.c:997
 msgid "View _Unformatted"
 msgstr "æª¢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1577
+#: ../mail/em-format-html-display.c:960
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1634
+#: ../mail/em-format-html-display.c:1017
 msgid "O_pen With"
 msgstr "ä»¥...é??å??(_O)"
 
-#: ../mail/em-format-html-display.c:1711
-msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
-msgstr "Evolution ç?¡æ³?é¡¯ç¤ºæ¤å°?é?»å?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??ç??å¤§å°?ã??ä½ å?¯ä»¥ç?¨ä¸?æ??ç??ç??æ?¹å¼?æ??ä½¿ç?¨å¤?é?¨æ??å?ç·¨è¼¯å?¨ä¾?é?±è®?å®?ã??"
-
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "ç¬¬ %d / %d é ?"
 
-#: ../mail/em-format-html.c:505
-#: ../mail/em-format-html.c:514
+#: ../mail/em-format-html.c:165
+msgid "Formatting message"
+msgstr "æ ¼å¼?å??é?µä»¶"
+
+#: ../mail/em-format-html.c:356
+msgid "Formatting Message..."
+msgstr "æ ¼å¼?å??é?µä»¶..."
+
+#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "æ£å?¨æ?·å?? `%s'"
 
-#: ../mail/em-format-html.c:929
+#: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:937
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:1892
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:978
+#: ../mail/em-format-html.c:1903
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??ç¤º"
 
-#: ../mail/em-format-html.c:980
+#: ../mail/em-format-html.c:1905
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:1001
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:1012
+#: ../mail/em-format-html.c:1937
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ä¸?æ??ç??å¤?é?¨æª?æ¡?æ??ç¤º (ã??%sã??é¡?å??)"
 
-#: ../mail/em-format-html.c:1240
-msgid "Formatting message"
-msgstr "æ ¼å¼?å??é?µä»¶"
-
-#: ../mail/em-format-html.c:1414
-msgid "Formatting Message..."
-msgstr "æ ¼å¼?å??é?µä»¶..."
-
-#: ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1631
-#: ../mail/em-format-html.c:1652
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:926
-#: ../mail/em-mailer-prefs.c:79
-msgid "Cc"
-msgstr "å?¯æ?¬"
-
-#: ../mail/em-format-html.c:1568
-#: ../mail/em-format-html.c:1637
-#: ../mail/em-format-html.c:1655
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:927
-#: ../mail/em-mailer-prefs.c:80
-msgid "Bcc"
-msgstr "å¯?ä»¶å?¯æ?¬"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1747
-#: ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1435
-msgid "Mailer"
-msgstr "å¯?ä»¶è??"
-
 #. 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:1910
+#: ../mail/em-format-html.c:2595
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "é??å°?é?µä»¶æ?¯ç?± <b>%s</b> ä»£è¡¨ <b>%s</b> å¯?å?º"
 
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:924
-#: ../mail/em-mailer-prefs.c:77
-msgid "Reply-To"
-msgstr "å??è¦?"
-
-#: ../mail/em-format.c:929
-#: ../mail/em-mailer-prefs.c:82
-#: ../mail/message-list.etspec.h:2
-#: ../widgets/misc/e-dateedit.c:316
-#: ../widgets/misc/e-dateedit.c:338
-msgid "Date"
-msgstr "æ?¥æ??"
-
-#: ../mail/em-format.c:930
-#: ../mail/em-mailer-prefs.c:83
-msgid "Newsgroups"
-msgstr "æ?°è??ç¾£çµ?"
-
-#: ../mail/em-format.c:931
-#: ../mail/em-mailer-prefs.c:84
-#: ../plugins/face/org-gnome-face.eplug.xml.h:4
-msgid "Face"
-msgstr "é?¢è²?"
-
-#: ../mail/em-format.c:1201
-#, c-format
-msgid "%s attachment"
-msgstr "%s é??å? æª?æ¡?"
-
-#: ../mail/em-format.c:1239
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
-
-#: ../mail/em-format.c:1376
-#: ../mail/em-format.c:1533
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "ç?¡æ³?è§£æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
-
-#: ../mail/em-format.c:1384
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message"
-msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-#: ../mail/em-format.c:1552
-msgid "Unsupported signature format"
-msgstr "ä¸?æ?¯æ?´ç??ç°½ç½²æ ¼å¼?"
-
-#: ../mail/em-format.c:1560
-#: ../mail/em-format.c:1698
-msgid "Error verifying signature"
-msgstr "æª¢é©?ç°½ç½²ç?¼ç??é?¯èª¤"
-
-#: ../mail/em-format.c:1560
-#: ../mail/em-format.c:1689
-#: ../mail/em-format.c:1698
-msgid "Unknown error verifying signature"
-msgstr "æª¢é©?ç°½ç½²ç?¼ç??ä¸?æ??é?¯èª¤"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message"
-msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message: Unknown error"
-msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Every time"
-msgstr "æ¯?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per day"
-msgstr "æ¯?å¤©ä¸?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per week"
-msgstr "æ¯?é?±ä¸?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:98
-msgid "Once per month"
-msgstr "æ¯?æ??ä¸?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:332
-msgid "Add Custom Junk Header"
-msgstr "å? å?¥è?ªé?¸å??å?¾é?µä»¶æª?é "
-
-#: ../mail/em-mailer-prefs.c:336
-msgid "Header Name:"
-msgstr "æ¨?é å??ç¨±:"
-
-#: ../mail/em-mailer-prefs.c:337
-msgid "Header Value Contains:"
-msgstr "æ¨?é æ?¸å?¼å??å?«:"
-
-#: ../mail/em-mailer-prefs.c:438
-#: ../widgets/table/e-table-click-to-add.c:500
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "é ?é¦?"
-
-#: ../mail/em-mailer-prefs.c:442
-msgid "Contains Value"
-msgstr "å??å?«æ?¸å?¼"
-
-#: ../mail/em-mailer-prefs.c:465
-msgid "Color"
-msgstr "é¡?è?²"
-
-#: ../mail/em-mailer-prefs.c:468
-msgid "Tag"
-msgstr "æ¨?ç±¤"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1063
-#: ../mail/em-mailer-prefs.c:1117
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s å¤?æ??ç¨?å¼?å·²å?¯ä½¿ç?¨ä¸¦ä¸?è©²è»?ä»¶ä¹?å®?è£?å®?æ??ã??"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1071
-#: ../mail/em-mailer-prefs.c:1126
-#, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
-msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?ä½¿ç?¨ã??è«?æª¢æ?¥æ?¯å?¦æ??å®?è£?è©²å¥?ä»¶ã??"
-
-#: ../mail/em-mailer-prefs.c:1092
-msgid "No Junk plugin available"
-msgstr "æ²?æ??å?¯ç?¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?"
-
-#: ../mail/em-mailer-prefs.c:1455
-msgid "Date header:"
-msgstr "æ?¥æ??æ¨?é ï¼?"
-
-#. green
-#: ../mail/em-migrate.c:961
-msgid "To Do"
-msgstr "å¾?è¾¦"
-
-#. blue
-#: ../mail/em-migrate.c:962
-msgid "Later"
-msgstr "ç¨?å¾?"
-
-#: ../mail/em-migrate.c:1128
-msgid "Migration"
-msgstr "ç§»è½?"
-
-#: ../mail/em-migrate.c:1573
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "ç?¡æ³?å»ºç«?æ?°è³?æ??å¤¾ `%s'ï¼?%s"
-
-#: ../mail/em-migrate.c:1599
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "ç?¡æ³?è¤?è£½è£½è³?æ??å¤¾ `%s' è?³ `%s'ï¼?%s"
-
-#: ../mail/em-migrate.c:1784
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
-
-#: ../mail/em-migrate.c:1789
-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 ""
-"Evolution ä¿¡ç®±è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±æ?´æ?¹äº?ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../mail/em-migrate.c:1990
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
-
-#: ../mail/em-migrate.c:2004
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "ç?¡æ³?å»ºç«? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
-
-#: ../mail/em-migrate.c:2033
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "ç?¡æ³?è¤?è£½ POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
-
-#: ../mail/em-migrate.c:2504
-#: ../mail/em-migrate.c:2516
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "ç?¡æ³?å»ºç«?æ?¬å?°é?µä»¶å?²å?å?? `%s':%s"
-
-#: ../mail/em-migrate.c:2874
-msgid "Migrating Folders"
-msgstr "æ£å?¨è½?ç§»è³?æ??å¤¾"
-
-#: ../mail/em-migrate.c:2874
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ä¿¡ç®±è³?æ??å¤¾ç??æ??è¦?æ ¼å¼?å¾? Evolution 2.24 å¾?è½?æ??ç?º SQLiteã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../mail/em-migrate.c:2955
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "ç?¡æ³?å?¨ `%s' å»ºç«?æ?¬å?°é?µä»¶è³?æ??å¤¾:%s"
-
-#: ../mail/em-migrate.c:2974
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
-msgstr "ç?¡æ³?å¾?ä»¥å??ç?? Evolution è®?å??è¨å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å?å?¨æ??æ??æ¯?ã??"
-
-#: ../mail/em-popup.c:364
-msgid "Save As..."
-msgstr "å?¦å?æ?°æª?..."
-
-#: ../mail/em-popup.c:389
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../mail/em-popup.c:495
-#: ../widgets/misc/e-attachment-handler-image.c:147
-msgid "Set as _Background"
-msgstr "è¨ç?ºè??æ?¯(_B)"
-
-#: ../mail/em-popup.c:497
-msgid "_Reply to sender"
-msgstr "å??è¦?å¯?ä»¶è??(_R)"
-
-#: ../mail/em-popup.c:498
-#: ../ui/evolution-mail-message.xml.h:79
-msgid "Reply to _List"
-msgstr "å??è¦?è?³æ¸?å?®(_L)"
-
-#. make it first item
-#: ../mail/em-popup.c:547
-#: ../mail/em-popup.c:746
-msgid "_Add to Address Book"
-msgstr "å? å?¥å?°é??è¨?é??(_A)"
-
-#: ../mail/em-popup.c:725
-#, c-format
-msgid "Open in %s..."
-msgstr "å?¨ %s å?§é??å??..."
-
-#: ../mail/em-subscribe-editor.c:606
+#: ../mail/em-subscribe-editor.c:586
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "æ¤å?²å?å??ä¸?æ?¯æ?´è¨?é?±ï¼?æ??è??æ?ªå??ç?¨å®?å??ã??"
 
-#: ../mail/em-subscribe-editor.c:639
+#: ../mail/em-subscribe-editor.c:619
 msgid "Subscribed"
 msgstr "å·²è¨?é?±"
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:623
 msgid "Folder"
 msgstr "è³?æ??å¤¾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:858
+#: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
 msgstr "è«?é?¸æ??ä¸?å??ä¼ºæ??å?¨ã??"
 
-#: ../mail/em-subscribe-editor.c:894
+#: ../mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "å°?æ?ªé?¸æ??ä¼ºæ??å?¨"
 
-#. Check buttons
-#: ../mail/em-utils.c:121
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
-msgid "_Do not show this message again."
-msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯(_D)"
-
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:311
 msgid "Message Filters"
 msgstr "é?µä»¶è¦?å??"
 
-#: ../mail/em-utils.c:369
-msgid "message"
-msgstr "é?µä»¶"
-
-#: ../mail/em-utils.c:652
-msgid "Save Message..."
-msgstr "å?²å?é?µä»¶â?¦"
-
-#: ../mail/em-utils.c:702
-msgid "Add address"
-msgstr "æ?°å¢?å?°å??"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1223
+#: ../mail/em-utils.c:815
 #, c-format
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
 
-#: ../mail/em-vfolder-editor.c:114
+#: ../mail/em-vfolder-editor.c:124
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??å¤¾(_F)"
 
-#: ../mail/em-vfolder-rule.c:592
-msgid "Search Folder source"
-msgstr "æ??å°?è³?æ??å¤¾ä¾?æº?"
+#: ../mail/em-vfolder-rule.c:522
+msgid "Add Folder"
+msgstr "å? å?¥è³?æ??å¤¾"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Filter Editor\" window height"
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?é«?åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Filter Editor\" window maximize state"
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?æ??å¤§å??ç??æ??"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Filter Editor\" window width"
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?é??åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Search Folder Editor\" window height"
+msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?é«?åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?æ??å¤§å??ç??æ??"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Search Folder Editor\" window width"
+msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?é??åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?æ??å¤§å??ç??æ??"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?é??åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Allows Evolution to display text part of limited size"
 msgstr "å??è¨± evolution é¡¯ç¤ºå?§æ??é?¨ä»½ç??é??å?¶å¤§å°?"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "ä¸?å®?è¦?æ±?è®?ä¿¡å??æ¢?"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "è?ªå??è¡¨æ??è¾¨è?"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "è?ªå??é?£çµ?è¾¨è?"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "æª¢æ?¥å?§é??ç??å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "å¼?ç?¨å??ç?½è?²å½©"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "å¼?ç?¨å??ç?½è?²å½©ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
 msgstr "æ?°å¯«è¦?çª?é ?è¨é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
 msgstr "æ?°å¯«è¦?çª?é ?è¨é??åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "ç·¨è¼¯å?¨è®?å??/é??å? ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "å£?ç¸®å?¨ TO/CC/BCC ä¸ä½?å??ç??é¡¯ç¤ºæ?¹å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
 msgstr "å°? TO/CC/BCC ä¸ä½?å??ç??é¡¯ç¤ºæ?¹å¼?å£?ç¸®ç?º address_count ä¸æ??å®?ç??é?·åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
 msgstr "æ?§å?¶æ?¬å?°ç«¯æ?´æ?¹è??é? ç«¯é?µä»¶ä¼ºæ??å?¨å??æ¥ç??é »ç??ã??é??é??å¿?é ?è?³å°?æ?? 30 ç§?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr "æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªé?¸æ¨?é ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:19
-msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
 msgstr "æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªé?¸æ¨?é ã??æ¤æ¸?å?®ä¸ç??å??ç´ æ ¼å¼?ç?ºã??headername=valueã??å?ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?è¨å?ç¬¦é??"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?è¨å?ç¬¦é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?è¨å?ç¬¦é??"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?è¨å?ç¬¦é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
 msgstr "é ?è¨è½?é??æ¨£å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?è¨é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "é?µä»¶è¦?çª?ç??é ?è¨é«?åº¦ã??"
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default height of the mail browser window."
+msgstr "é?µä»¶ç??è¦½å?¨è¦?çª?ç??é ?è¨é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "è¨?é?±å°?è©±ç??ç??é ?è¨é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Default maximized state of the mail browser window."
+msgstr "é?µä»¶ç??è¦½å?¨è¦?çª?ç??æ??å¤§å??ç??æ??ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
 msgstr "é ?è¨å??è¦?æ¨£å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
 msgstr "ç?¸é??é?µä»¶å±?é??ç??æ??ç??é ?è¨æ?¸å?¼"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?è¨é??åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "é?µä»¶è¦?çª?ç??é ?è¨é??åº¦ã??"
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid "Default width of the mail browser window."
+msgstr "é?µä»¶ç??è¦½å?¨è¦?çª?ç??é ?è¨é??åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
 msgstr "è¨?é?±å°?è©±ç??ç??é ?è¨é??åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to look up addresses for junk filtering in local address book only"
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr "æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸å°?æ?¾æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??é?»å?é?µä»¶ä½?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "æ±ºå®?æ?¯å?¦å?¨é??è¨?é??ä¸å°?æ?¾å¯?ä»¶è??é?»å?é?µä»¶å¸³è??"
 
-#: ../mail/evolution-mail.schemas.in.h:35
-msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
 msgstr "æ±ºå®?æ?¯å?¦å?¨é??è¨?é??ä¸å°?æ?¾å¯?ä»¶è??é?»å?é?µä»¶å¸³è??ã??å¦?æ??æ?¾å¾?å?°ï¼?å°±ä¸?å?¤æ?·ç?ºå??å?¾é?µä»¶ã??å®?æ??æ??å°?æ¨?è¨?ç?ºè?ªå??è£?é½?ç??é??è¨?é??ã??ä½?è?¥æ¨?è¨?ç?ºè?ªå??è£?é½?ç??æ?¯é? ç«¯é??è¨?é??ï¼?å?? LDAPï¼?ï¼?å??é??åº¦å?¯è?½æ??å¾?æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "æ±ºå®?æ?¯å?¦ä½¿ç?¨è?ªé?¸æ¨?é ä¾?æª¢æ?¥å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:37
-msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
 msgstr "æ±ºå®?æ?¯å?¦ä½¿ç?¨è?ªé?¸æ¨?é ä¾?æª¢æ?¥å??å?¾é?µä»¶ã??å¦?æ??å??ç?¨é??å??é?¸é ?ä¸¦ä¸?æ??ä¾?æ¨?é ï¼?å°?æ??æ??å??å??å?¾é?µä»¶æª¢æ?¥ç??é??åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
 msgstr "æ±ºå®?æ?¯å?¦å?¨å??ç?´æª¢è¦?ç??ã??é?µä»¶ã??è£?ç??ã??å¯?ä»¶äººã??å??ã??ä¸»æ?¨ã??ä¸ä½¿ç?¨å??æ¨£ç??å?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
-msgstr "ç?¨ä¾?é?µä»¶ç·¨è¼¯å?¨è¼?å?¥/é??å? æª?æ¡?ç??ç?®é??ã??"
+msgstr "ç?¨ä¾?é?µä»¶ç·¨è¼¯å?¨è¼?å?¥/é??ä»¶ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "ç?¨ä¾?å?²å?é?µä»¶å??ä»¶æª?ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "å??ç?¨æ??å??ç?¨å?´é??å??ç??è³?æ??å¤¾å??ç¨±ç??ç?¥å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Do not add signature delimiter"
+msgstr "ç?¡æ³?å? å?¥ç°½å??æª?å??é??ç¬¦è??"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ç?¶ä½ è¼¸å?¥å?§å®¹æ??å?¨æ??å?ä¸?é¡¯ç¤ºæ?¼å?é?¯èª¤æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "é?¢é??æ??æ¸?ç©ºå??å?¾é?µä»¶è³?æ??å¤¾"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "çµ?æ??æ??æ¸?ç©ºå??å?¾è³?æ??å¤¾"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "é?¢é?? Evolution æ??æ¸?ç©ºæ??æ??å??å?¾é?µä»¶è³?æ??å¤¾ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "çµ?æ?? Evolution æ??æ¸?ç©ºæ??æ??å??å?¾è³?æ??å¤¾"
 
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
 msgstr "å??ç?¨ HTML é?µä»¶ä¸ç??å??ç?«å??ç??ã??è¨±å¤?ä½¿ç?¨è??èª?ç?ºå??ç?«å??ç??å¾?ç?©äººï¼?å? è??å??å¥½ä»¥é??æ??å??ç??ä»£æ?¿ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "å??ç?¨æ??å?¥è??æ¨¡å¼?ï¼?å¦?æ¤ä½ å?¯ä»¥å?¨é?±è®?é?µä»¶æ??ç??å?°æ¸¸æ¨?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "å??ç?¨æ??å??ç?¨é?è¡?ç©ºç?½é?µ"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "å??ç?¨æ??å??ç?¨æ¨?è¨?å¤?å??é?µä»¶æ??ç??æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "å??ç?¨æ??å??ç?¨é?¨æ??å?³æ?¥å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "å??ç?¨æ??å°?è³?æ??å¤¾"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "å??ç?¨ç¨?å¼?é??å§?æ??æ??å°?è³?æ??å¤¾ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Enable the side bar search feature to allow interactive searching of folder names."
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr "å??ç?¨å?´é??å??æ??å°?å??è?½å??è¨±äº?å??å¼?æ??å°?è³?æ??å¤¾å??ç¨±ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:55
-msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
 msgstr "å??ç?¨æ¤é?¸é ?å?¯å?¨é?µä»¶é ?è¦½ã??é?µä»¶æ¸?å?®å??è³?æ??å¤¾ä¸ä½¿ç?¨ç©ºç?½é?µæ?²å??ç?«é?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr "å??ç?¨ä»¥é¡¯ç¤ºé??å?¶å¤§å°?ç??é?µä»¶æ??å?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "å??ç?¨/å??ç?¨æ??å?¥è??æ¨¡å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:58
-#: ../mail/mail-config.glade.h:86
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "å°?æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook/GMail å½¢å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:59
-msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr "å°?é?µä»¶æ¨?é ä¸ç??æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?å¥½è®?å®?å??è?½æ£ç¢ºé¡¯ç¤ºç?± Evolution å¯?å?ºç?? UTF-8 å?ç¬¦æª?æ¡?å??ç¨±ï¼?å? ç?ºå®?å??ä¸¦æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?æ£ç¢ºç?? RFC 2047 æ¨?æº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é?±è??å??è³?æ??å¤¾é ?è¦½ä¸¦ç§»é?¤é?¸å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:63
-msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+#: ../mail/evolution-mail.schemas.in.h:71
+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:64
-msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
-msgstr "ç?¶ã??é ?è¦½ã??çª?æ ¼é??å??æ??ï¼?å°?å®?ç·?è²¼é¡¯ç¤ºè??é??é??ç??é¡¯ç¤ºã??"
-
-#: ../mail/evolution-mail.schemas.in.h:65
-msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr "å¦?æ??æ²?æ??å?§ç½®æª¢è¦?å?¨å?¯ç?¨æ?¼ Evolution è£?é?¢ç?¹æ®?ç?? MIME é¡?å??ï¼?ä»»ä½?é¡¯ç¤ºå?¨æ¤æ¸?å?®ç??  MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??åº«ä¹? Bonobo å??ä»¶æª¢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§å®¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:66
-msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?é«?åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?é«?åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?é«?åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
-msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?é??åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?é??åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:69
-msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
-msgstr "å®?å??ç?¨/å??ç?¨å?¨é?²å?¥é?¢ç·?æ¨¡å¼?å??æ?¯å?¦é??è¤?æ??ç¤ºæ??ç?¡é?¢ç·?å??å??æ¥ç??é??æ±?ã??"
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?é??åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?é??åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
 msgstr "å®?å??ç?¨/å??ç?¨å?¨å¾?æ??å°?è³?æ??å¤¾ä¸å?ªé?¤é?µä»¶æ??æ?¯å?¦é??è¤?æ??ç¤ºä»¥è¦å??é?£å°?æ??æ°¸ä¹?å?ªé?¤é?µä»¶ï¼?è??é??å??æ?¯å°?é?µä»¶è?ªæ??å°?çµ?æ??ä¸ç§»é?¤ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??å?¾é?µä»¶ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??æ?¶ç?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Layout style"
+msgstr "é??ç½®æ¨£å¼?"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "æ¨?ç±¤å??ç?¸é??è?²å½©ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME é¡?å??æ¸?å?®ï¼?æª¢æ?¥ Bonobo å??ä»¶æª¢è¦?å?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "æ?¥æ?¶ç??æ??æ¬?æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "å¸³è??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr "Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??å¸³è??æ¸?å?®ã??æ¸?å?®å??å?«è?? /apps/evolution/mail/accounts ç?¸é??ç??å?ä¸²å?½å??å?ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "è?ªé?¸æª?é ä»¥å??å®?å??æ?¯å?¦å??ç?¨ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ç?¨æ?¼æ?¼å?æª¢æ?¥ç??å?å?¸èª?è¨?ç¢¼æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr "Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??æ¨?ç±¤æ¸?å?®ã??æ¸?å?®å??å?«å?ä¸²ï¼?å?¶ä¸å??å?« name:colorï¼?color ä½¿ç?¨ HTML å??å?é?²ä½?ç·¨ç¢¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "å·²ç¶?æ?¥å??å?¶æ??æ¬?ç??å??å®?æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "é??é?? HTTP è¼?å?¥ HTML é?µä»¶ç??å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid ""
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr "é??é?? HTTP(S) è¼?å?¥ HTML é?µä»¶ç??å??ç??ã??å?¯è?½ç??å?¼ç?ºï¼?ã??0ã??â?? ä¸?å¾?ç¶²çµ¡è¼?å?¥å??ç??ã??ã??1ã??â?? å¦?æ??æ?¯å?¨è?¯çµ¡äººè£?ç??å¯?ä»¶è??æ??ï¼?è¼?å?¥å??ç??ã??ã??2ã??- ä¸?å®?å¾?ç¶²çµ¡è¼?å?¥å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "è¨?é??é??æ¿¾å?¨å??ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "å°?é??æ¿¾å?¨å??ä½?è¨?é??å?°æ??å®?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "ç?¨æ?¼è¨?é??é??æ¿¾å?¨å??ä½?ç??è¨?é??æª?æ¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "ç?¨æ?¼è¨?é??é??æ¿¾å?¨å??ä½?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Mail browser height"
+msgstr "é?µä»¶ç??è¦½å?¨é«?åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr "é?µä»¶ç??è¦½å?¨æ??å¤§å??"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Mail browser width"
+msgstr "é?µä»¶ç??è¦½å?¨é??åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?ç¤ºæ??å·²é?±è®?"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?ç¤ºæ??å·²é?±è®?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "å?¨é?µä»¶ã??é ?è¦½ã??ä¸æ¨?ç¤ºå¼?ç?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "å?¨é?µä»¶ã??é ?è¦½ã??ä¸æ¨?ç¤ºå¼?ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default height"
-msgstr "é?µä»¶è¦?çª?é ?è¨é«?åº¦"
-
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Message Window default width"
-msgstr "é?µä»¶è¦?çª?é ?è¨é??åº¦"
-
 # (pofilter) gconf: do not translate gconf attribute: "normal", "source"
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "è¨?æ?¯é¡¯ç¤ºæ¨£å¼? (ã??normalã??[ä¸?è?¬]ã??ã??full headersã??[å®?æ?´æª?é ]ã??ã??sourceã??[ä¾?æº?])"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr "çµ?æ??æ??æ¸?ç©ºå??å?¾é?µä»¶æ??å°?é??é??å¤©æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
 msgstr "çµ?æ??æ??æ¸?ç©ºå??æ?¶ç?æ??å°?é??é??å¤©æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "çµ?æ??æ??æ¸?ç©ºå??å?¾é?µä»¶æ??å°?é??é??å¤©æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "çµ?æ??æ??æ¸?ç©ºå??æ?¶ç?æ??å°?é??é??å¤©æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "é¡¯ç¤ºæ?¼ TO/CC/BCC ä¸ä½?å??ç??é?·åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "æ²?æ??ä¸»æ?¨æ??æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ç?¶ä½¿ç?¨è??å??è©¦æ¸?ç©ºè³?æ??å¤¾æ??ï¼?æ??ç¤ºä½¿ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??æ²?æ??ä¸»æ?¨ç??é?µä»¶æ??ï¼?æ??ç¤ºä½¿ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "æ??ç¤ºä½¿ç?¨è??ä»¥ç¢ºèª?æ?¯å?¦ç«?å?³é?²å?¥é?¢ç·?"
-
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
 msgstr "ç?¶å?ªé?¤æ??å°?è³?æ??å¤¾ä¸ç??é?µä»¶æ??é¡¯ç¤ºæ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "ä½¿ç?¨è??æ¸?ç©ºæ??æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "ç?¶ä½¿ç?¨è??å?ªå¡«å¯«å¯?ä»¶å?¯æ?¬æ??æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ç?¶ä½¿ç?¨è??å??è©¦ä¸?æ¬¡é??å?? 10 å??æ??æ?´å¤?é?µä»¶æ??æ??ç¤ºä½¿ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:109
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+#: ../mail/evolution-mail.schemas.in.h:122
+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:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??ä¸?å?«æ?¶ä»¶è??æ??å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶æ??ï¼?æ??ç¤ºä½¿ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ç?¶ä½¿ç?¨è??å??è©¦å?³é??ä¸?æ?³è¦?ç?? HTML æ??æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "ç?¶æ¨?è¨?å¤?å??é?µä»¶æ??æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Put personalized signatures at the top of replies"
 msgstr "å°?å??äººå??ç°½å??æª?ç½®æ?¼å??ä¿¡é ?ç«¯"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put the cursor at the bottom of replies"
 msgstr "å??è¦?æ??å°?æ¸¸æ¨?ç½®æ?¼åº?é?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "è¾¨èª?æ??å?ä¸ç??è¡¨æ??ç¬¦è??ä¸¦å??ä»£æ??å??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "è¾¨èª?æ??å?ä¸ç??é?£çµ?ä¸¦å°?ä¹?å??ä»£ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "å?¨å?§é??ç??é?µä»¶å?·è¡?å??å?¾é?µä»¶æª¢æ?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "å?²å?ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Search for the sender photo in local address books"
 msgstr "å?¨æ?¬å?°ç«¯é??è¨?é??æ??å°?å¯?ä»¶è??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "é ?è¨å?³é?? HTML é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "é ?è¨å?³é?? HTML é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®ç??å¯?ä»¶è??é?»å?é?µä»¶æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "ä¼ºæ??å?¨å??æ¥é??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr "è¨ç?º TRUE è¡¨ç¤ºå?¨ä½ æ?°å¯«é?µä»¶æ??ä¸?æ?³å?¨ç°½å??æª?å??å? å?¥ç°½å??æª?å??é??ç¬¦ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "å¼µè²¼å?°æ?°è??ç¾£çµ?æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "å¼µè²¼å?°æ?°è??ç¾£çµ?æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "é¡¯ç¤ºå??ç?«"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Show all message headers"
+msgstr "é¡¯ç¤ºæ??æ??é?µä»¶æª?é "
+
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Show all the headers when viewing a messages."
+msgstr "æª¢è¦?é?µä»¶æ??é¡¯ç¤ºæª?é ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
 msgstr "æ?æ?¾å??ç?«å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸é¡¯ç¤ºå?ªé?¤ç??é?µä»¶ (å? ä¸?å?ªé?¤è??)"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸é¡¯ç¤ºå?ªé?¤ç??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show image animations"
 msgstr "é¡¯ç¤ºå??ç?«å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Show original \"Date\" header value."
+msgstr "é¡¯ç¤ºå??å§?ç??ã??æ?¥æ??ã??æ¨?é æ?¸å?¼ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
 msgstr "é¡¯ç¤ºå¯?ä»¶è??ç??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
 msgstr "å¼µè²¼å?°æ?°è??ç¾£çµ?æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid "Show the \"From\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+#: ../mail/evolution-mail.schemas.in.h: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:142
-msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
 msgstr "å¼µè²¼å?°æ?°è??ç¾£çµ?æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:143
-msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid "Show the email-address of the sender in a separate column in the message list."
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
 msgstr "å?¨é?µä»¶æ¸?å?®ç??ä¸ä»¥å??é?¢ç??æ¬?ä½?é¡¯ç¤ºå¯?ä»¶è??ç??é?»å?é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr "é¡¯ç¤ºå??å§?ç??ã??æ?¥æ??ã??æª?é ï¼?è?¥æ??å??ä¸?å??æ??æ??ä½¿ç?¨ç?¶å?°æ??é??ï¼?ã??å?¦å??æ°¸é? ä»¥ä½¿ç?¨è??å??å¥½ç??æ ¼å¼?å??æ?¬å?°æ??å??é¡¯ç¤ºã??æ?¥æ??ã??æª?é ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨é?µä»¶é?±è®?çª?æ ¼ä¸é¡¯ç¤ºå¯?ä»¶è??ç??ç?¸ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "è¡?å?§æ?¼å?æª¢æ?¥"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "æ?¼å?æª¢æ?¥é¡?è?²"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "æ?¼å?æª¢æ?¥èª?è¨?"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "è¨?é?±å°?è©±ç??é ?è¨é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "è¨?é?±å°?è©±ç??é ?è¨é??åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "çµ?ç«¯æ©?å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "æ??å?é?µä»¶é??å?¶"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "å??å?¾é?£é?¤ç??é ?è¨å¤?æ??ç¨?å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "ä¸?æ¬¡å?·è¡?æ¸?ç©ºå??å?¾é?µä»¶ç??æ??é??ï¼?å¾?é?»è?¦ç´?å??å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "ä¸?æ¬¡å?·è¡?æ¸?å?®å??æ?¶ç?ç??æ??é??ï¼?å¾?ç´?å??å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr "é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨é?µä»¶æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®æ??é??ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??çµ?ç«¯æ©?å?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??è®?å??é??åº¦å?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
+#: ../mail/evolution-mail.schemas.in.h:175
+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:159
-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."
+#: ../mail/evolution-mail.schemas.in.h:176
+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."
 msgstr "é??è£?æ±ºå®?äº?é?µä»¶å?§æ??å?¨ Evolution ä¸å?¯æ??ç??ç??æ??å¤§å®¹é??ã??é ?è¨ç??å¤§å°?æ?¯ 4MB / 4096 KBï¼?ä»¥ KB ä¾?æ??å®?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
 msgstr "é??æ?¯é ?è¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?ï¼?å?³ä½¿å·²å??ç?¨äº?å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??å¦?æ??å??ç?¨é??è£?å??å?ºç??é ?è¨å¤?æ??ç¨?å¼?ï¼?ä¸¦ä¸?æ??å½±é?¿å?¶ä»?å?¯ç?¨ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:161
-msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
 msgstr "é??å??é?µå?¼å?ªè?½è®?å??ä¸?æ¬¡ï¼?ä¸¦æ??å?¨è®?å??å¾?è¨ç?ºã??falseã??ã??é??æ¨£æ??å??æ¶?å?¨æ¸?å?®ä¸å°?è©²é?µä»¶ç??é?¸å??ä¸¦ç§»é?¤å°?è©²è³?æ??å¤¾ç??é ?è¦½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:162
-msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
 msgstr "æ¤å¯?ç¢¼å??æ??è©²å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªé?¸æª?é ï¼?ä»¥å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é æ??é¡¯ç¤ºå?¨é?µä»¶æª¢è¦?ï¼?å??è¨å®?æ?? enabledã??"
 
-#: ../mail/evolution-mail.schemas.in.h:163
-msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
 msgstr "é??å??é?¸é ?ç?¸é??æ?¼é?µå?¼ã??lookup_addressbookã??ï¼?æ?¯ç?¨ä¾?æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸æ?¥è©¢é?»å?é?µä»¶ä½?å??ä»¥ç?¨æ?¼å??å?¾é?µä»¶é??æ¿¾æ??ã??æ??é?¤å·²ç?¥è?¯çµ¡äººå¯?å?ºç??é?µä»¶ã??å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "é??å??é?¸é ?è?½å??å?©å¢?é?²æ?¥æ?¶ç??é??åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
 msgstr "é??æ??è¨å®?å?¨é ?è¨é?µä»¶æ¸?å?®æª¢è¦?ä¸é¡¯ç¤ºä½?å??ç??é?·åº¦ï¼?è¶?é??ç??é?¨å??æ??é¡¯ç¤ºã??...ã??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
 msgstr "é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶é ?è¨ç?ºå±?é??æ??æ?¶æ?ºç??ç??æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
 msgstr "é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶è¦?æ ¹æ??æ¯?å??é?µä»¶ç¾£çµ?æ??æ?°ç??é?µä»¶æ??åº?ï¼?è??é??æ ¹æ??é?µä»¶ç??æ?¥æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Thread the message list."
-msgstr "ä¸²æ?¥é?µä»¶æ¸?å?®ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Thread the message-list"
-msgstr "ä¸²æ?¥é?µä»¶æ¸?å?®"
-
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
 msgstr "ä»¥ä¸»æ?¨ç?ºå?ºç¤?ä¸²æ?¥é?µä»¶æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "å°?é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "å°?é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ç??æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
 msgstr "é ?è¨å¸³è??ç?? UID å?ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ä½¿ç?¨è¡?å?§æ?¼å?æª¢æ?¥æ??å°?æ?¼é?¯å?ç??åº?ç·?é¡?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
 msgstr "ä½¿ç?¨ SpamAsssassin ä¼ºæ??ç¨?å¼?å??å®¢æ?¶ç«¯"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ä½¿ç?¨ SpamAsssassin ä¼ºæ??ç¨?å¼?å??å®¢æ?¶ç«¯ (spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "ä½¿ç?¨è?ªé?¸å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "ä½¿ç?¨è?ªé?¸å?å??ä¾?é¡¯ç¤ºé?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ (æ²?æ?? DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid "Use side-by-side or wide layout"
-msgstr "ä½¿ç?¨ç·?è²¼æ??å¯¬é??ç½®"
-
-#: ../mail/evolution-mail.schemas.in.h:182
-msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
+#: ../mail/evolution-mail.schemas.in.h:196
+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:183
-msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
+#: ../mail/evolution-mail.schemas.in.h:197
+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:184
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "è®?å??é??åº¦å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é ?è¨å?¨æ¯?å°?é?µä»¶å? å?¥è®?ä¿¡å??æ¢?ç??è¦?æ±?"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æ?¯å?¦å??ç?¨å?´é??å??ç??è³?æ??å¤¾å??ç¨±ç??ç?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr "ç?¶é?µä»¶ä¸?å??å?« In-Reply-To æ?? References æª?é æ??ï¼?æ?¯å?¦æ??ç?§ä¸»æ?¨æ?¾å??é?µä»¶ç¾£çµ?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦æ ¹æ??é?µä»¶ç¾£çµ?ä¸æ??æ?°ç??é?µä»¶ä¾?æ??åº?ç?¸é??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼é??åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é??åº¦ã??"
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:178
 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:603
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+msgid "Mail"
+msgstr "é?µä»¶"
+
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm è¼¸å?¥å?¨"
@@ -12702,696 +11626,525 @@ msgstr "Evolution Elm è¼¸å?¥å?¨"
 msgid "Import mail from Elm."
 msgstr "å¾? Elm å?¯å?¥é?µä»¶ã??"
 
-#: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../mail/importers/evolution-mbox-importer.c:115
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "ç?®ç??å?°è³?æ??å¤¾:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
+msgid "Select folder"
+msgstr "é?¸æ??è³?æ??å¤¾"
+
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "é?¸å??è³?æ??å¤¾ä¾?è¼¸å?¥"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../shell/e-shell-utils.c:218
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley é?µä»¶ä¿¡ç®± (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:261
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "å?¯å?¥ Berkeley é?µä»¶ä¿¡ç®±æ ¼å¼?è³?æ??å¤¾"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "æ£å?¨å?¯å?¥ä¿¡ç®±"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:454
-#: ../plugins/pst-import/pst-importer.c:560
-#: ../shell/e-shell-importer.c:555
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
 msgid "Importing `%s'"
 msgstr "æ£å?¨å?¯å?¥ â??%sâ??"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "æ??æ?? %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "è¼¸å?¥ç®¡é??è³?æ??"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:379
+#: ../modules/addressbook/addressbook-config.c:986
+msgid "Address Book"
+msgstr "é??è¨?é??"
+
+#: ../mail/importers/pine-importer.c:420
 msgid "Evolution Pine importer"
 msgstr "Evolution ç®¡é??è¼¸å?¥å?¨"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:421
 msgid "Import mail from Pine."
 msgstr "å¾? Pine å?¯å?¥é?µä»¶ã??"
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "é?µä»¶é??å?° %s"
 
-#: ../mail/mail-autofilter.c:235
-#: ../mail/mail-autofilter.c:274
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "é?µä»¶ä¾?è?ª %s "
 
-#: ../mail/mail-autofilter.c:258
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "ä¸»æ?¨æ?¯ %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s é?µä»¶å??è¡¨"
 
-#: ../mail/mail-autofilter.c:364
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "æ?°å¢?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/mail-component.c:573
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
-msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
-
-#: ../mail/mail-component.c:577
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d å°?å·²å?ªé?¤"
-msgstr[1] "%d å°?å·²å?ªé?¤"
-
-#: ../mail/mail-component.c:584
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d å°?å??å?¾"
-msgstr[1] "%d å°?å??å?¾"
-
-#: ../mail/mail-component.c:587
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d å??è??ç¨¿"
-msgstr[1] "%d å??è??ç¨¿"
-
-#: ../mail/mail-component.c:589
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d å°?å·²å?³é??"
-msgstr[1] "%d å°?å·²å?³é??"
-
-#: ../mail/mail-component.c:591
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d å°?æ?ªå?³é??"
-msgstr[1] "%d å°?æ?ªå?³é??"
-
-#: ../mail/mail-component.c:597
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d å°?æ?ªè®?ï¼?"
-msgstr[1] "%d å°?æ?ªè®?ï¼?"
-
-#: ../mail/mail-component.c:598
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "å?± %d å°?"
-msgstr[1] "å?± %d å°?"
-
-#: ../mail/mail-component.c:952
-msgid "New Mail Message"
-msgstr "æ?°å¢?é?µä»¶"
-
-#: ../mail/mail-component.c:953
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "é?µä»¶è¨?æ?¯(_M)"
-
-#: ../mail/mail-component.c:954
-msgid "Compose a new mail message"
-msgstr "ç·¨è¼¯æ?°ç??é?µä»¶è¨?æ?¯"
-
-#: ../mail/mail-component.c:960
-msgid "New Mail Folder"
-msgstr "æ?°é?µä»¶è³?æ??å¤¾"
-
-#: ../mail/mail-component.c:961
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "é?µä»¶è³?æ??å¤¾(_F)"
-
-#: ../mail/mail-component.c:962
-msgid "Create a new mail folder"
-msgstr "å»ºç«?æ?°é?µä»¶è³?æ??å¤¾"
-
-#: ../mail/mail-component.c:1109
-msgid "Failed upgrading Mail settings or folders."
-msgstr "å??ç´?é?µä»¶æ??è³?æ??å¤¾å¤±æ??ã??"
-
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(æ³¨æ??ï¼?é??è¦?é??æ?°å??å??æ¤æ??ç?¨ç¨?å¼?)"
 
-#: ../mail/mail-config.glade.h:3
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>æ¤ Evolution ç??æ?¬ä¸?æ?¯æ?´ SSL</b>"
-
-#: ../mail/mail-config.glade.h:4
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>å¯?ä»¶è??ç?¸ç??</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sig_natures</b>"
-msgstr "<b>ç°½ç½²(_N)</b>"
-
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>ç½®é ?å¼µè²¼é?¸é ?</b> (ä¸?å»ºè°)"
 
-#: ../mail/mail-config.glade.h:7
-msgid "<b>_Languages</b>"
-msgstr "<b>èª?è¨?(_L)</b>"
-
-#: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">å¸³è??è³?è¨?</span>"
-
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">é©?è?</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">æ?°å¯«é?µä»¶</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">çµ?æ??</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">é ?è¨è¡?ç?º</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">å?ªé?¤é?µä»¶</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">é¡¯ç¤ºç??é?µä»¶æª?é (_H)</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">æ¨?ç±¤</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">è¼?å?¥å??ç??</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">é?µä»¶é¡¯ç¤º</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">é?µä»¶å?å??</span>"
+#: ../mail/mail-config.ui.h:3
+msgid "Account Information"
+msgstr "å¸³è??è³?è¨?"
 
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">é?µä»¶å??æ¢?</span>"
-
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">é?¸æ??æ?§è³?è¨?</span>"
-
-#: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">é?¸é ?</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">å?´å¯?ç§?é?±æ¬? (PGP/GPG)</span>"
-
-# zh_HK: msgstr "<span weight=\"bold\">æ??å?°ç?¨ç??å?å??</span>"
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">æ??å?°ç?¨ç??å?å??</span>"
-
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">ä»£ç??ä¼ºæ??å?¨è¨å®?</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">å¿?è¦?è³?è¨?</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">å®?å?¨ MIME (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">å®?å?¨æ?§</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">å·±å?³é??ç??å??è??ç¨¿é?µä»¶</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">ä¼ºæ??å?¨çµ?æ??</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">é©?è?é¡?å??(_A)</span>"
-
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "å¸³è??ç¸½ç®¡"
-
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
 msgstr "å? å?¥æ?°ç??ç°½å??æª?(_W)..."
 
-#: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "æ?°å¢?å?½ä»¤ç¨¿(_S)"
-
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.ui.h:5
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "ä½¿ç?¨æ¤å¸³è??æ??ä¸?å®?å?¨å¤?é??ç??é?µä»¶ç°½ç½²(_W)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??ä¹?å? å¯?æ?¬èº«(_F)"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ä¸?å®?å¯?é??å?¯æ?¬ (_Cc) çµ¦:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ä¸?å®?å¯?é??å¯?ä»¶å?¯æ?¬ (_Bcc) çµ¦:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "å? å¯?æ??æ°¸é? ä¿¡ä»»æ??ç??å¯?ç¢¼å??å??è£?ç??å¯?ç¢¼å??(_T)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??æ°¸é? è?ªæ??å? å¯?(_M)"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "æ°¸é? è¦?æ±?è®?ä¿¡å??æ¢?(_D)"
 
-#: ../mail/mail-config.glade.h:45
-msgid ""
-"Attachment\n"
-"Inline\n"
-"Quoted"
-msgstr ""
-"é??ä»¶\n"
-"è¡?å?§\n"
-"å¼?æ??"
-
-#: ../mail/mail-config.glade.h:48
-msgid ""
-"Attachment\n"
-"Inline (Outlook style)\n"
-"Quoted\n"
-"Do not quote"
-msgstr ""
-"é??ä»¶\n"
-"è¡?å?§ (Outlook é¢¨æ ¼)\n"
-"å¼?æ??\n"
-"ä¸?è¦?å¼?ç?¨"
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "é©?è?"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "è?ªå??æ??å?¥è¡¨æ??ç¬¦è??(_E)"
 
-#: ../mail/mail-config.glade.h:53
-msgid "Baltic (ISO-8859-13)"
-msgstr "æ³¢ç¾?ç??æµ·èª?ç³» (ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:54
-msgid "Baltic (ISO-8859-4)"
-msgstr "æ³¢ç¾?ç??æµ·èª?ç³» (ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "å?ç¬¦é??(_H):"
 
-#: ../mail/mail-config.glade.h:56
-#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "æª¢æ?¥æ?¯æ?´ç??é¡?å??(_E) "
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "ä»¥è?ªé?¸æ¨?é æª¢æ?¥å??å?¾é?µä»¶(_S)"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "æª¢æ?¥å?§é??é?µä»¶æ?¯å?¦ç?ºå??å?¾é?µä»¶(_M)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "ç?¶æ??è¼¸å?¥æ??æª¢æ?¥æ?¼å?(_T)"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "æª¢æ?¥å?§é??ç??å??å?¾é?µä»¶è¨?æ?¯"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "æ¸?é?¤(_A)"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "æ¸?é?¤(_R)"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "æ?¼é?¯å?ç??é¡?è?²(_M):"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.ui.h:25
+msgid "Composing Messages"
+msgstr "æ£å?¨ç·¨è¼¯é?µä»¶"
+
+#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "çµ?æ??"
+
+#: ../mail/mail-config.ui.h:27
 msgid "Confirm _when expunging a folder"
 msgstr "å?ªé?¤è³?æ??å¤¾æ??ç¢ºèª?(_W)"
 
-#: ../mail/mail-config.glade.h:65
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"æ?å??ä½ ï¼?é?µä»¶è¨å®?å·²ç¶?å®?æ??ã??\n"
-"\n"
-"ä½ ç?¾å?¨å?¯ä»¥é??å§?ä½¿ç?¨ Evolution\n"
-"æ?¶ç?¼é?»å?é?µä»¶ã??\n"
-"\n"
-"è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å?è¨å®?ã??"
+#: ../mail/mail-config.ui.h:29
+msgid "Default Behavior"
+msgstr "é ?è¨è¡?ç?º"
 
-#: ../mail/mail-config.glade.h:71
-msgid "De_fault"
-msgstr "é ?è¨å?¼(_F)"
-
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "é ?è¨å?ç¬¦ç·¨ç¢¼(_N):"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.ui.h:32
+msgid "Delete Mail"
+msgstr "å?ªé?¤é?µä»¶"
+
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "é?¢é??æ??å?ªé?¤å??å?¾é?µä»¶(_X)"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ç?ºå¤?é??ç??é?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½² [é ?è¨å?¼] (_U)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:36
+msgid "Displayed Message _Headers"
+msgstr "é¡¯ç¤ºç??é?µä»¶æª?é (_H)"
+
+#: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "ä¸?æ??ç??é?µä»¶å?§æ??ç??æ??å?å¤§å°?ä¸?é??(_Z)"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:38
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "è?¥å¯?ä»¶è??å?¨æ??ç??é??è¨?é??ä¸å°±ä¸?è¦?å°?é?µä»¶æ¨?è¨?ç?ºå??å?¾é?µä»¶(_K)"
 
-#: ../mail/mail-config.glade.h:79
-msgid "Done"
-msgstr "å®?æ??"
+#: ../mail/mail-config.ui.h:39
+msgid "Do not quote"
+msgstr "ä¸?ä½¿ç?¨å¼?æ??"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "è??ç¨¿å?£(_F):"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Email Accounts"
-msgstr "é?»å?é?µä»¶å¸³è??"
-
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "é?»å?é?µä»¶ä½?å??(_A):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "é?¢é??æ??æ¸?ç©ºå??æ?¶ç?è³?æ??å¤¾(_X)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "å??ç?¨é?è¡?ç©ºç?½é?µ(_P)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "å??ç?¨æ??å°?è³?æ??å¤¾(_R)"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "å? å¯?è?æ?¸(_P):"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¤?é??ç??é?µä»¶ (é ?è¨å?¼)(_E)"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "å?ºå®?é??åº¦(_X):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "å?ºå®?é??åº¦å?å??(_E):"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "å?å??å?§å®¹"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "å°?é?µä»¶æ ¼å¼?å??ç?º _HTML"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E):"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML é?µä»¶"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ä»£ç??ä¼ºæ??å?¨:"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "æª?é "
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "å¼·èª¿å¼?æ??ç?º(_Q)"
 
-#: ../mail/mail-config.glade.h:101
-msgid "If the server uses a non-standard port then specify the server address as \"server-name:port-number\""
-msgstr "å¦?æ??ä¼ºæ??å?¨ä½¿ç?¨é??æ¨?æº?é?£æ?¥å? å??ä»¥ã??ä¼ºæ??å?¨å??ç¨±:é?£æ?¥å? è??ã??ç??æ?¹å¼?æ??å®?ä¼ºæ??å?¨ä½?å??"
+#: ../mail/mail-config.ui.h:59
+msgid "Inline"
+msgstr "è¡?å?§"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:60
+msgid "Inline (Outlook style)"
+msgstr "è¡?å?§ï¼?Outlook é¢¨æ ¼ï¼?"
+
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:104
-#: ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æ¨?ç±¤"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "èª?è¨?è¡¨"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Mail Configuration"
-msgstr "é?µä»¶çµ?æ??"
+#: ../mail/mail-config.ui.h:65
+msgid "Loading Images"
+msgstr "æ£å?¨è¼?å?¥å??ç??"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "é?µä»¶æª?é è¡¨"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "ä¿¡ç®±ä½?ç½®"
 
-#: ../mail/mail-config.glade.h:110
-msgid "Message Composer"
-msgstr "é?µä»¶ç·¨è¼¯å?¨"
+#: ../mail/mail-config.ui.h:68
+msgid "Message Display"
+msgstr "é?µä»¶é¡¯ç¤º"
+
+#: ../mail/mail-config.ui.h:69
+msgid "Message Fonts"
+msgstr "é?µä»¶å?å??"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr "é?µä»¶å??æ¢?"
+
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "æ²?æ??ä»£ç??ä¼ºæ??å?¨çµ¦(_P):"
 
-#: ../mail/mail-config.glade.h:112
-msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr "æ³¨æ??ï¼?å?¨æ¨?ç±¤å??ç¨±ä¸ç??åº?ç·?æ?¯ç?¨ä¾?æ¨?è¨?é?¸å?®ä¸ç??æ?·å¾?é?µã??"
-
-#: ../mail/mail-config.glade.h:113
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+#: ../mail/mail-config.ui.h:73
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr "æ³¨æ??ï¼?å?¨é¦?æ¬¡é?£ç·?ä¹?å??å°?ä¸?æ??æ??ç¤ºä½ è¼¸å?¥å¯?ç¢¼"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦?æ??æ?¾å?°ç¬¦å??ç??è?ªé?¸å??å?¾é?µä»¶æ¨?é é??å??é?¸é ?å°±æ??è¢«å¿½ç?¥ã??"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:75
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "é?¸æ??æ?§ç??è³?è¨?"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "å??é«?(_G):"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG å¯?ç¢¼å?? ID:"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "å¯?ç¢¼(_W):"
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please configure the following account settings."
-msgstr "è«?å?¨è¨å®?ä¸?å??å¸³è??ç??è¨å®?å?¼ã??"
-
-#: ../mail/mail-config.glade.h:120
-msgid "Please enter a descriptive name for this account in the space below. This name will be used for display purposes only."
-msgstr "è«?å?¨ä¸?é?¢ç??ç©ºé??è¼¸å?¥æ??è¿°é??å??å¸³è??ç??å??ç¨±ã??é??å??å??ç¨±å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
-
-#: ../mail/mail-config.glade.h:121
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??ä½ ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²çµ¡æ??å??ä¾?æ??å??ã??"
-
-#: ../mail/mail-config.glade.h:122
-msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
-msgstr "è«?å?¨ä¸?é?¢è¼¸å?¥ä½ ç??å??ç¨±å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??ä½ å¸?æ??å?¨é??å?ºç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "é?£æ?¥å? :"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ç?¶å?³é??ç??é?µä»¶å?ªæ??æ??å®?å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??æ??é¡¯ç¤ºæ??ç¤º(_O)"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:83
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "å?´å¯?ç§?é?±æ¬? (PGP/GPG)"
+
+# zh_HK: msgstr "å??å?°å??å¿?é??"
+#: ../mail/mail-config.ui.h:85
+msgid "Printed Fonts"
+msgstr "å??å?°å??å¿?é??"
+
+#: ../mail/mail-config.ui.h:86
+msgid "Proxy Settings"
+msgstr "ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Quoted"
+msgstr "å¼?æ??"
+
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "è¨?ä½?å¯?ç¢¼(_M)"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "å??è¦?å?°å??(_P):"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "è¨?ä½?å¯?ç¢¼(_P)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:92
+msgid "Required Information"
+msgstr "å¿?è¦?ç??è³?è¨?"
+
+#: ../mail/mail-config.ui.h:94
+msgid "SSL is not supported in this build of Evolution"
+msgstr "æ¤ Evolution ç??æ?¬ä¸?æ?¯æ?´ SSL"
+
+#: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
 msgstr "å?ªæ??å°?æ?¬å?°ç«¯é??è¨?é??ä¸ç??å¯?ä»¶è??ç?¸ç??(_E)"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "é?¸å??(_E)..."
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "å?³é??é?µä»¶å??æ¢?(_E):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
 msgstr "æ¨?æº?å?å??(_T):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:99
+msgid "Secure MIME (S/MIME)"
+msgstr "å®?å?¨å¼? MIME (S/MIME)"
+
+#: ../mail/mail-config.ui.h:101
+msgid "Select Drafts Folder"
+msgstr "é?¸æ??è??ç¨¿è³?æ??å¤¾"
+
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "é?¸æ?? HTML å?ºå®?é??åº¦å?å??"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font for printing"
 msgstr "é?¸æ??ç?¨æ?¼æ??å?°ç?? HTML å?ºå®?é??åº¦å?å??"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "é?¸æ?? HTML å?¯è®?é??åº¦å?å??"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font for printing"
 msgstr "é?¸æ??ç?¨æ?¼æ??å?°ç?? HTML å?¯è®?é??åº¦å?å??"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:106
+msgid "Select Sent Folder"
+msgstr "é?¸æ??å¯?ä»¶è³?æ??å¤¾"
+
+#: ../mail/mail-config.ui.h:107
+msgid "Sender Photograph"
+msgstr "å¯?ä»¶è??ç?¸ç??"
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "å?³é??é?µä»¶"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "å?³é??é?µä»¶è³?æ??å¤¾(_M):"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:110
+msgid "Sent and Draft Messages"
+msgstr "å¯?ä»¶è??è??ç¨¿é?µä»¶"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "ä¼ºæ??å?¨è¦?æ±?é©?è?(_V)"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:112
+msgid "Server Configuration"
+msgstr "ä¼ºæ??å?¨çµ?æ??"
+
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "ä¼ºæ??å?¨é¡?å??(_T):"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.ui.h:114
+msgid "Sig_natures"
+msgstr "ç°½å??æª?(_N)"
+
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
 msgstr "ç°½ç½²è?æ?¸(_N):"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "ç°½å??æª?(_U):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
-msgstr "ç°½ç½²"
-
-#: ../mail/mail-config.glade.h:146
-msgid "Signatures Table"
-msgstr "ç°½ç½²è¡¨"
+msgstr "ç°½å??æª?"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "æ?¼å?æª¢æ?¥"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "å??è¦?æ??å¾?åº?é?¨é??å§?è¼¸å?¥(_T)"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.ui.h:121
 msgid "T_ype:"
 msgstr "é¡?å??(_Y):"
 
-#: ../mail/mail-config.glade.h:150
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+#: ../mail/mail-config.ui.h:122
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr "é??è£?ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºå·²ç¶?å®?è£?å?å?¸ç??èª?è¨?ã??"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used for display purposes only."
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 "é??å??å?½ä»¤ç¨¿ç??è¼¸å?ºæ??ç?¨ä¾?ä½?ç?ºä½ ç??\n"
-"ç°½å??æª?ã??ä½ æ??å®?ç??å??ç¨±å?ªæ??ä½?ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
+"ç°½å??æª?ã??ä½ æ??å®?ç??å??ç¨±å?ªæ??ä½?ç?º\n"
+"é¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13399,215 +12152,244 @@ msgstr ""
 "è¼¸å?¥æ?³ç?¨ä¾?ä»£è¡¨é??å??å¸³è??ç??å??ç¨±ã??\n"
 "ä¾?å¦?ï¼?ã??å·¥ä½?ã??æ??ã??å??äººã??"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_E):"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "ä½¿ç?¨é©?è?(_N)"
 
-#: ../mail/mail-config.glade.h:157
-#: ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:701
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:441
 #: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/google-account-setup/google-source.c:700
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_N):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "å?¯è®?é??åº¦(_A):"
 
-#: ../mail/mail-config.glade.h:159
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"æ¡è¿?ä½¿ç?¨ Evolution é?µä»¶çµ?æ??å?©ç??ã??\n"
-"\n"
-"æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
-
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "å? å?¥ç°½å??æª?(_A)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
 msgstr "ä¸?å®?è?ªç¶²çµ¡ä¸?è¼?å??ç??(_A)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "é©?è?é¡?å??(_A)"
+
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
 msgstr "é ?è¨å??å?¾é?µä»¶å¤?æ??ç¨?å¼?(_D):"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "ç?´æ?¥é?£ç·?å?°äº?è?¯ç¶²(_D)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?ç°½ç½²æ??è°é??è«? (å?¼å®¹æ?¼ _Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "è½?å¯?æ?¹å¼?(_F):"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "å??ä¿¡æ??ä¿?ç??å??å§?é?µä»¶ç??ç°½ç½²(_K)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.ui.h:140
+msgid "_Languages"
+msgstr "èª?è¨?(_L)"
+
+#: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
 msgstr "è¼?å?¥ç?±è?¯çµ¡äººå¯?å?ºé?µä»¶ä¸ç??å??ç??(_L)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "å?ªå?¨æ?¬å?°é??è¨?é??æ?¥è©¢(_L)"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
 msgstr "è¨ç?ºæ??ç??é ?è¨å¸³è??(_M)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??(_M):"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "æ¨?ç¤ºé?µä»¶ç?ºå·²é?±è®?æ?¼(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
 msgstr "ä¸?å®?ä¸?è?ªç¶²çµ¡ä¸?è¼?å??ç??(_N)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "è·¯å¾?(_P):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.ui.h:149
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "ç?¶å?³é?? HTML é?µä»¶çµ¦ä¸?æ?³æ?¶å?°é??é¡?é?µä»¶ç??è?¯çµ¡äººæ??é¡¯ç¤ºæ??ç¤º(_P)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ç?¶å?³é??æ²?æ??ä¸»æ?¨ç??é?µä»¶æ??é¡¯ç¤ºæ??ç¤º(_P)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "å??è¦?æ?¹å¼?(_R):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "å?½ä»¤ç¨¿(_S):"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??ä¼ºæ??å?¨(_S):"
 
-#: ../mail/mail-config.glade.h:183
-msgid "_Select..."
-msgstr "é?¸å??(_S)..."
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../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.glade.h:186
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "é¡¯ç¤ºå??ç?«å??ç??(_S)"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨é?µä»¶é ?è¦½é¡¯ç¤ºå¯?ä»¶è??ç?¸ç??(_S)"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ç¸®ç? _To / Cc / Bcc æª?é ç?º"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "ä½¿ç?¨å®?å?¨é?£ç·?(_U):"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "ä½¿ç?¨ç³»çµ±é ?è¨å?¼(_U)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "ä½¿ç?¨è??å?¶ä»?æ??ç?¨ç¨?å¼?ç?¸å??ç??å?å??(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+msgid "a"
+msgstr "a"
+
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "å?°å??"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+msgid "b"
+msgstr "b"
+
+#: ../mail/mail-config.ui.h:166
 msgid "color"
 msgstr "è?²å½©"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 msgstr "æ??è¿°"
 
-#: ../mail/mail-config.glade.h:197
-msgid "seconds"
-msgstr "ç§?å¾?"
-
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>æ??å°?è³?æ??å¤¾ä¾?æº?</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">æ?¸ç¢¼ç°½ç½²</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">å? å¯?</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "æ??æ??å?¯ç?¨ç??é? ç«¯è³?æ??å¤¾"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local and active remote folders"
 msgstr "æ??æ??æ?¬å?°ç«¯å??å?¯ç?¨ç??é? ç«¯è³?æ??å¤¾"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local folders"
 msgstr "æ??æ??æ?¬å?°ç«¯è³?æ??å¤¾"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "å??å§?ä½?ç½®"
+
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "å·²å®?æ??(_M)"
 
-#: ../mail/mail-dialogs.glade.h:9
-#: ../mail/message-tag-followup.c:270
-msgid "Flag to Follow Up"
-msgstr "è¦?è·?é?¨ç??æ¨?å¹?"
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "æ?¸ç¢¼ç°½ç½²"
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "ä¸?è¦?è½?å¯?"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "å? å¯?"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "è³?æ??å¤¾è¨?é?±"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Follow-Up"
+msgstr "è·?é?¨"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "For Your Information"
+msgstr "çµ¦ä½ ç??è³?è¨?"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Forward"
+msgstr "è½?å¯?"
+
+#: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
 msgstr "æ??æ¬?å??ç´?"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.ui.h:15
+msgid "No Response Necessary"
+msgstr "ä¸?é??è¦?å??æ??"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Reply to All"
+msgstr "å?¨é?¨å??è¦?"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Review"
+msgstr "æª¢é?±"
+
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
 msgstr "ä¼ºæ??å?¨(_E):"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Search Folder Sources"
+msgstr "æ??å°?è³?æ??å¤¾ä¾?æº?"
+
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "ä¿?å?¨æ?§è³?è¨?"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "æ??å®?ç??è³?æ??å¤¾"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:25
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13615,43 +12397,42 @@ msgstr ""
 "ä½ é?¸æ??è¦?è·?é?¨ç??é?µä»¶å·²å?¨ä¸?é?¢å??å?ºã??\n"
 "è«?å¾?ã??æ¨?å¹?ã??é?¸å?®ä¸é?¸æ??è·?é?¨ç??å??ä½?ã??"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "æ?¥å??æ??æ¬?(_A)"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "å?°æ??æ?¼(_D):"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
 msgstr "æ¨?å¹?(_F):"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:893
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:107
+#: ../mail/mail-ops.c:95
 msgid "Filtering Selected Messages"
 msgstr "é??æ¿¾é?¸æ??ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:254
 msgid "Fetching Mail"
 msgstr "æ?¥æ?¶é?µä»¶"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:562
+#: ../mail/mail-ops.c:585
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??æ¿¾å?¨ï¼?%s"
 
-#: ../mail/mail-ops.c:574
-#: ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13660,127 +12441,126 @@ msgstr ""
 "ç?¡æ³?é??å? è?³ %sï¼?%s\n"
 "æ?¹é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??ã??"
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:641
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??ï¼?%s"
 
-#: ../mail/mail-ops.c:724
-#: ../mail/mail-ops.c:805
+#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
 msgid "Sending message"
 msgstr "æ£å?¨å?³é??é?µä»¶"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ£å?¨å?³é??é?µä»¶ %d / %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:789
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ç?¡æ³?å?³é??ç¬¬ %d å??é?µä»¶ (å?± %d å??)"
 
-#: ../mail/mail-ops.c:763
-#: ../mail/mail-send-recv.c:701
+#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:765
-#: ../mail/mail-send-recv.c:703
+#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:877
-msgid "Saving message to folder"
-msgstr "å?²å?é?µä»¶å?°è³?æ??å¤¾"
+#: ../mail/mail-ops.c:905
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "å?²å?é?µä»¶å?°è³?æ??å¤¾ã??%sã??"
+
+#: ../mail/mail-ops.c:982
+#, c-format
+msgid "Moving messages to '%s'"
+msgstr "å°?é?µä»¶ç§»å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:954
+#: ../mail/mail-ops.c:982
 #, c-format
-msgid "Moving messages to %s"
-msgstr "å°?é?µä»¶ç§»å?° %s"
+msgid "Copying messages to '%s'"
+msgstr "å°?é?µä»¶è¤?è£½å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:954
+#: ../mail/mail-ops.c:1091
 #, c-format
-msgid "Copying messages to %s"
-msgstr "å°?é?µä»¶è¤?è£½å?° %s"
+msgid "Scanning folders in '%s'"
+msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:1171
+#: ../mail/mail-ops.c:1199
 msgid "Forwarded messages"
 msgstr "å·²è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:1212
+#: ../mail/mail-ops.c:1240
 #, c-format
-msgid "Opening folder %s"
-msgstr "é??å??è³?æ??å¤¾ %s"
+msgid "Opening folder '%s'"
+msgstr "é??å??è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1277
+#: ../mail/mail-ops.c:1306
 #, c-format
-msgid "Retrieving quota information for folder %s"
-msgstr "å??å¾?è³?æ??å¤¾ %s ç??ç?¨é??é??é¡?è³?è¨?"
+msgid "Retrieving quota information for folder '%s'"
+msgstr "å??å¾?è³?æ??å¤¾ã??%sã??ç??ç?¨é??é??é¡?è³?è¨?"
 
-#: ../mail/mail-ops.c:1346
+#: ../mail/mail-ops.c:1378
 #, c-format
-msgid "Opening store %s"
-msgstr "é??å??è²¯è?? %s"
+msgid "Opening store '%s'"
+msgstr "é??å??è²¯è??ã??%sã??"
 
-#: ../mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1449
 #, c-format
-msgid "Removing folder %s"
-msgstr "ç§»é?¤è³?æ??å¤¾ %s"
+msgid "Removing folder '%s'"
+msgstr "ç§»é?¤è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1535
+#: ../mail/mail-ops.c:1567
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "è²¯è??è³?æ??å¤¾ã??%sã??"
+msgstr "æ£å?¨è²¯è??è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1598
+#: ../mail/mail-ops.c:1630
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æ¸?ç©ºå??å?²å?å¸³è?? '%s'"
 
-#: ../mail/mail-ops.c:1599
+#: ../mail/mail-ops.c:1631
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?²å?å¸³è?? '%s'"
 
-#: ../mail/mail-ops.c:1653
-msgid "Refreshing folder"
-msgstr "é??æ?°è¼?å?¥è³?æ??å¤¾"
+#: ../mail/mail-ops.c:1685
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "é??æ?°æ?´ç??è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1693
-#: ../mail/mail-ops.c:1743
-msgid "Expunging folder"
-msgstr "å?ªé?¤è³?æ??å¤¾"
+#: ../mail/mail-ops.c:1725
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "æ£å?¨å?ªå?»è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1740
+#: ../mail/mail-ops.c:1770
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "æ¸?ç©º '%s' ç??å??æ?¶ç?"
+msgstr "æ¸?ç©ºã??%sã??ç??å??æ?¶ç?"
 
-#: ../mail/mail-ops.c:1741
+#: ../mail/mail-ops.c:1771
 msgid "Local Folders"
 msgstr "æ?¬æ©?è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:1822
-#, c-format
-msgid "Retrieving message %s"
-msgstr "å??å??é?µä»¶ %s"
-
-#: ../mail/mail-ops.c:1931
+#: ../mail/mail-ops.c:1967
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "å??å?? %d å°?é?µä»¶"
 msgstr[1] "å??å?? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "å?²å? %d å°?é?µä»¶"
 msgstr[1] "å?²å? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2136
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13789,12 +12569,11 @@ msgstr ""
 "å?²å?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
 " %s"
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2208
 msgid "Saving attachment"
 msgstr "å?²å?é??ä»¶"
 
-#: ../mail/mail-ops.c:2186
-#: ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13803,135 +12582,130 @@ msgstr ""
 "ä¸?è?½å»ºç«?è¼¸å?ºæª?æ¡?ï¼?%sï¼?\n"
 " %s"
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2249
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ç?¡æ³?å¯«å?¥è³?æ??ï¼?%s"
 
-#: ../mail/mail-ops.c:2354
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Disconnecting from %s"
-msgstr "ä¸æ?·è?? %s ç??é?£ç·?"
+msgid "Disconnecting from '%s'"
+msgstr "ä¸æ?·è??ã??%sã??ç??é?£ç·?"
 
-#: ../mail/mail-ops.c:2354
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Reconnecting to %s"
-msgstr "é??æ?°é?£ç·?å?° %s"
+msgid "Reconnecting to '%s'"
+msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:2450
+#: ../mail/mail-ops.c:2490
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æº?å??å¸³è??ã??%sã??é?¢ç·?å·¥ä½?"
 
-#: ../mail/mail-ops.c:2536
+#: ../mail/mail-ops.c:2576
 msgid "Checking Service"
 msgstr "æª¢æ?¥æ??å??"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:189
 msgid "Canceling..."
 msgstr "æ£å?¨å??æ¶?..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "å?³é??è??æ?¥æ?¶é?µä»¶"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:553
 msgid "Updating..."
 msgstr "æ?´æ?°ä¸..."
 
-#: ../mail/mail-send-recv.c:503
-#: ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
 msgid "Waiting..."
 msgstr "æ£å?¨ç?å¾?..."
 
-#: ../mail/mail-send-recv.c:814
+#: ../mail/mail-send-recv.c:873
 #, c-format
 msgid "Checking for new mail"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?èª?"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "è¼¸å?¥å¯?èª?"
 
-#: ../mail/mail-session.c:215
-#: ../plugins/exchange-operations/exchange-config-listener.c:705
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?ç¢¼"
 
-#: ../mail/mail-session.c:217
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "è¼¸å?¥å¯?ç¢¼"
 
-#: ../mail/mail-session.c:259
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "ä½¿ç?¨è??å·²å??æ¶?æ??ä½?ã??"
 
-#: ../mail/mail-signature-editor.c:202
-msgid "_Save and Close"
-msgstr "å?²å?å¾?é??é??(_S)"
-
-#: ../mail/mail-signature-editor.c:356
-msgid "Edit Signature"
-msgstr "ç·¨è¼¯ç°½å??æª?"
+#: ../mail/mail-session.c:663
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/mail-signature-editor.c:371
-msgid "_Signature Name:"
-msgstr "ç°½å??æª?å??ç¨±(_S):"
+#: ../mail/mail-session.c:669
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??å¸³è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:123
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?æ?«å?åº?å??ç?®é?? `%s'ï¼?%s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:153
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "æ£å?¨å??è©¦ç§»å??é?? mbox ä¾?æº? `%s' ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "è½?å¯?ç??é?µä»¶ - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:301
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "è³?æ??å¤¾ç?¡æ??:`%s'"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "è¨å®?æ??å°?è³?æ??å¤¾ï¼? %s"
 
-#: ../mail/mail-vfolder.c:234
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?° '%s:%s' ç??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:241
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:1067
+#: ../mail/mail-vfolder.c:1172
 msgid "Edit Search Folder"
 msgstr "ç·¨è¼¯æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1265
 msgid "New Search Folder"
 msgstr "æ?°å¢?æ??å°?è³?æ??å¤¾"
 
@@ -13947,22 +12721,29 @@ msgstr "å·²ç¶?æ??å??ç¨±ç?ºã??{1}ã??ç??è³?æ??å¤¾å?å?¨ã??è«?ä½¿ç?¨ä¸?å??ç??å??ç¨±
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit."
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 msgstr ""
 "ä½?æ?¼ã??{1}ã??ç??é??ç©ºç?½è³?æ??å¤¾å·²ç¶?å?å?¨ã??\n"
 "\n"
 "ä½ å?¯ä»¥é?¸æ??å¿½ç?¥æ¤è³?æ??å¤¾ã??è¦?å¯«æ??é??å? å®?ç??å?§å®¹æ??è??çµ?æ??ã??"
 
 #: ../mail/mail.error.xml.h:6
-msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr "ã??{1}ã??å·²è¦?æ±?å?³é??è®?ä¿¡å??æ¢?ã??æ?¯å?¦å?³é??è®?ä¿¡å??æ¢?çµ¦ {0}ï¼?"
 
 #: ../mail/mail.error.xml.h:7
-msgid "A signature already exists with the name \"{0}\". Please specify a different name."
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr "å·²ç¶?æ??å??ç¨±ç?ºã??{0}ã??ç??ç°½å??æª?å?å?¨ã??è«?ä½¿ç?¨ä¸?å??ç??å??ç¨±ã??"
 
 #: ../mail/mail.error.xml.h:8
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr "ç?ºé?µä»¶å? ä¸?æ??æ??ç¾©ç??ä¸»æ?¨ï¼?å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??ä½ ç??é?µä»¶å??ä»?éº¼äº?æ??é??ã??"
 
 #: ../mail/mail.error.xml.h:9
@@ -13974,7 +12755,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é??å??å¸³è??ï¼?"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é??å??å¸³è??ä»¥å??å®?æ??æ??ç??ä»£ç??ä¼ºæ??å?¨ï¼?"
 
 #: ../mail/mail.error.xml.h:12
@@ -13982,11 +12764,15 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "ä½ ç¢ºå®?è¦?ä¸?æ¬¡é??é??å?? {0} å°?é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr "è¦?æ°¸ä¹?ç§»é?¤æ??æ??è³?æ??å¤¾ä¸æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 msgstr "ç¢ºå®?è¦?æ°¸ä¹?ç§»é?¤è³?æ??å¤¾ã??{0}ã??ä¸æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:15
@@ -13994,195 +12780,195 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "è¦?å?³é?? HTML æ ¼å¼?ç??é?µä»¶?"
 
 #: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "è¦?å?³é??é?»å?é?µä»¶ä½?å??ç?¡æ??ç??é?µä»¶?"
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "è¦?å?³é??é?»å?é?µä»¶ä½?å??ç?¡æ??ç??é?µä»¶?"
+
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "è¦?å?³é??å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "è¦?å?³é??æ²?æ??ä¸»æ?¨ç??é?µä»¶ï¼?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because \"{0}\"."
 msgstr "å? ç?ºã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Because \"{2}\"."
 msgstr "å? ç?ºã??{2}ã??ã??"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "ç©ºç?½ç°½å??æª?"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "ä¸?è?½å? å?¥æ??å°?è³?æ??å¤¾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "ç?¡æ³?å°?ã??{0}ã??è³?æ??å¤¾è¤?è£½è?³ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create folder \"{0}\"."
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create temporary save directory."
 msgstr "ç?¡æ³?å»ºç«?æ?«æ??å?²å?ç?®é??ã??"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "ä¸?è?½å»ºç«?å?²å?ç?®é??ï¼?å? ç?ºã??{1}ã??"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete folder \"{0}\"."
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "ä¸?è?½å?ªé?¤ç³»çµ±è³?æ??å¤¾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "ä¸?è?½ç·¨è¼¯æ??å°?è³?æ??å¤¾ã??{0}ã??ï¼?å? ç?ºå®?ä¸?å?å?¨ã??"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ä¸?è?½å°?è³?æ??å¤¾ã??{0}ã??ç§»è?³ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{1}\""
 msgstr "ä¸?è?½é??å??ä¾?æº?ã??{1}ã??"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open source \"{2}\"."
 msgstr "ä¸?è?½é??å??ä¾?æº?ã??{2}ã??ã??"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot open target \"{2}\"."
 msgstr "ä¸?è?½é??å??ç?®æ¨?ã??{2}ã??ã??"
 
-#: ../mail/mail.error.xml.h:34
-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."
+#: ../mail/mail.error.xml.h:36
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr "ä¸?è?½è®?å??æ??æ¬?æ¢?æ¬¾æª?æ¡?ã??{0}ã??ï¼?æ??è©²æ?¯å®?è£?å??é¡?é? æ??ç??ã??å?¨ä½ å??æ??é??é ?æ??æ¬?ä¹?å??å°?ç?¡æ³?ä½¿ç?¨å®?ã??"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "ä¸?è?½å°?ã??{0}ã??é??æ?°å?½å??æ??ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "ä¸?è?½é??æ?°å?½å??æ??ç§»å??ç³»çµ±è³?æ??å¤¾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save changes to account."
 msgstr "ç?¡æ³?å?²å?å¸³è??æ?´æ?¹ã??"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to directory \"{0}\"."
 msgstr "ä¸?è?½å?²å?è?³ç?®é??ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot save to file \"{0}\"."
 msgstr "ä¸?è?½å?²å?è?³æª?æ¡?ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Cannot set signature script \"{0}\"."
 msgstr "ä¸?è?½è¨å®?ç°½å??æª?å?½ä»¤ç¨¿ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Check Junk Failed"
 msgstr "æª¢æ?¥å??å?¾é?µä»¶å¤±æ??"
 
 # (Abel) é?µç?¤ç??é?µæ??å¥½ä¸?è¯äº?
-#: ../mail/mail.error.xml.h:42
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+#: ../mail/mail.error.xml.h:44
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr "è«?æª¢æ?¥å¯?ç¢¼æ?¼å?æ?¯å?¦æ£ç¢ºã??è«?æ³¨æ??ï¼?å¾?å¤?å¯?ç¢¼å??å??å¤§å°?å¯«ï¼?ä½ å?¯è?½æ??äº? Caps Lockã??"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "Could not save signature file."
 msgstr "ç?¡æ³?å?²å?ç°½ç½²æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "å?ªé?¤ã??{0}ã??ï¼?"
-
-#: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "å?ªé?¤å¸³è??ï¼?"
-
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "æ?¯å?¦å?ªé?¤æ??å°?è³?æ??å¤¾ã??{0}ã??ä¸ç??é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "æ?¯å?¦å?ªé?¤æ??å°?è³?æ??å¤¾ä¸ç??é?µä»¶ï¼?"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "æ?¯å?¦æ?¾æ£?æ?´æ?¹ï¼?"
-
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "ä¸?è¦?å?ªé?¤(_E)"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do not delete"
 msgstr "ä¸?è¦?å?ªé?¤"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do not disable"
 msgstr "ä¸?è¦?å??ç?¨"
 
-#: ../mail/mail.error.xml.h:52
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+#: ../mail/mail.error.xml.h:50
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
 msgstr "æ?¯å?¦è¦?å?¨æ?¬å?°ç«¯å??æ¥é?£äº?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??è³?æ??å¤¾ï¼?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "æ?¯å?¦è¦?å°?å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ï¼?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "è¦?å?²å?æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "è¼¸å?¥å¯?ç¢¼ã??"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "è¼?å?¥é??æ¿¾å?¨å®?ç¾©æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "å?·è¡?ä½?æ¥æ??ï¼?ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "ç?¶ {0} æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "æª?æ¡?å?å?¨ä½?ç?¡æ³?è¦?å¯«ã??"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "æª?æ¡?å?å?¨ä½?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??ä½ é?¸æ??ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:62
-msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+#: ../mail/mail.error.xml.h:60
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr "å¦?æ??ä½ é?¸æ??å?ªé?¤è³?æ??å¤¾ï¼?å®?ç??æ??æ??å?§å®¹å??å?è³?æ??å¤¾å?§å®¹æ??æ°¸é? æ¶?å¤±ã??"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?æ??æ??ç??ä»£ç??ä¼ºæ??å?¨å¸³è??æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14190,137 +12976,147 @@ msgstr ""
 "å¦?æ??ç¹¼çº?ï¼?è©²å¸³è??ç??è³?è¨?ä»¥å??\n"
 "å®?æ??æ??ç??ä»£ç??ä¼ºæ??å?¨æ??æ°¸é? å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?å¸³è??è³?è¨?æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:67
-msgid "If you quit, these messages will not be sent until Evolution is started again."
+#: ../mail/mail.error.xml.h:65
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr "å¦?æ??ä½ é?¸æ??çµ?æ??ï¼?å??æ¬¡å??å?? Evolution ä¹?å??ï¼?ä¸?æ??å?³é??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "Ignore"
 msgstr "å¿½ç?¥"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Invalid authentication"
 msgstr "ç?¡æ??ç??é©?è?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:68
+msgid "Mail Deletion Failed"
+msgstr "å?ªé?¤é?µä»¶å¤±æ??"
+
+#: ../mail/mail.error.xml.h:69
 msgid "Mail filters automatically updated."
 msgstr "é?µä»¶é??æ¿¾å?¨è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:72
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+#: ../mail/mail.error.xml.h:70
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr "å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??å? å?¥äº?æ¤æª?é ï¼?æ??æ°¸é? å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã??"
 
-#: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "å°?å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?"
-
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:71
 msgid "Missing folder."
 msgstr "é?ºæ¼?è³?æ??å¤¾ã??"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:73
 msgid "No sources selected."
 msgstr "æ?ªé?¸å??ä¾?æº?ã??"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:74
 msgid "Opening too many messages at once may take a long time."
 msgstr "ä¸?æ¬¡é??å??é??å¤?é?µä»¶å?¯è?½æ??è?±è²»è¨±å¤?æ??é??ã??"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:75
 msgid "Please check your account settings and try again."
 msgstr "è«?æª¢æ?¥å¸³è??è¨å®?ä¸¦å??è©¦ä¸?æ¬¡ã??"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:76
 msgid "Please enable the account or send using another account."
 msgstr "è«?å??ç?¨è©²å¸³è??æ??ä½¿ç?¨å?¶ä»?å¸³è??å?³é??ã??"
 
-#: ../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."
+#: ../mail/mail.error.xml.h:77
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr "è«?å?¨ã??æ?¶ä»¶è??ï¼?ã??æ¬?ä½?è¼¸å?¥ä¸?å??æ??æ??ç??é?»å?é?µä»¶å?°å??ã??ä½ å?¯ä»¥æ??ä¸?ä¸?è¼¸å?¥æ?¹å¡?æ??é??ç??ã??æ?¶ä»¶è??ï¼?ã??æ??é??ï¼?æ??å°?é?»å?é?µä»¶å?°å??ã??"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}"
 msgstr ""
 "è«?ç¢ºå®?ä»¥ä¸?æ?¶ä»¶è??å¸?æ??ä¸¦ä¸?å?¯ä»¥æ?¥æ?¶ HTML é?»å?é?µä»¶ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "è«?è¼¸å?¥å?¯ä¾?è¾¨è?é??å??ç°½å??æª?ç??ç?¨ç?¹å??ç¨±ã??"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "è«?ç¨?å??ã??"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "è½?ç§»è??é?µä»¶è³?æ??å¤¾ã??{0}ã??ç?¼ç??å??é¡?ã??"
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "æ?¥è©¢ä¼ºæ??å?¨"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "å??ä¼ºæ??å?¨æ?¥è©¢æ?¯æ?´ç??é©?è?æ¼?ç®?æ³?æ¸?å?®ã??"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?ã??"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤è³?æ??å¤¾ã??{0}ã??ä»¥å??å®?æ??æ??ç??å?è³?æ??å¤¾?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:86
 msgid "Report Junk Failed"
 msgstr "å??å ±å??å?¾é?µä»¶å¤±æ??"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:87
 msgid "Report Not Junk Failed"
 msgstr "å??å ±ç?ºé??å??å?¾é?µä»¶å¤±æ??"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:88
 msgid "Search Folders automatically updated."
 msgstr "æ??å°?è³?æ??å¤¾è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:89
 msgid "Send Receipt"
 msgstr "å?³é??å??æ¢?"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:90
 msgid "Signature Already Exists"
 msgstr "ç°½å??æª?å·²ç¶?å?å?¨"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:91
 msgid "Synchronize"
 msgstr "å??æ¥å??"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize folders locally for offline usage?"
 msgstr "æ?¯å?¦å??æ¥è³?æ??å¤¾ä»¥ä¾?é?¢ç·?ä½¿ç?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:97
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
+#: ../mail/mail.error.xml.h:93
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr "Evolution é??è¦?ç³»çµ±è³?æ??å¤¾æ??è?½æ£å¸¸ä½?æ¥ï¼?è??ä¸?è©²è³?æ??å¤¾ä¸?å?¯ä»¥é??æ?°å?½å??ã??ç§»å??æ??å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 "å?³é??ç??è?¯çµ¡äººæ¸?å?®æ?¯è¨å®?æ??é?±è??æ¸?å?®æ?¶ä»¶è??ã??\n"
 "\n"
 "å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??æ?°å¢?æ¤æª?é ï¼?æ??å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?ä½ æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã?? "
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14334,7 +13130,7 @@ msgstr ""
 "    ã??{1}ã??\n"
 "è??ä¸?å·²æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14348,9 +13144,25 @@ msgstr ""
 "    ã??{1}ã??\n"
 "è??ä¸?å·²æ?´æ?°ã??"
 
+#: ../mail/mail.error.xml.h:107
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"ä¸?å??æ?¶ä»¶è??ç?¡æ³?è¾¨èª?ç?ºæ??æ??ç??é?»å?é?µä»¶å?°å??ï¼?\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"ä¸?å??æ?¶ä»¶è??ç?¡æ³?è¾¨èª?ç?ºæ??æ??ç??é?»å?é?µä»¶å?°å??ï¼?\n"
+"{0}"
+
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
-msgstr "ç¨?åº?æª?å¿?é ?å?å?¨è??ä¸?å?¯ä»¥å?·è¡?ã??"
+msgstr "å?½ä»¤ç¨¿æª?æ¡?å¿?é ?å?å?¨è??ä¸?å?¯ä»¥å?·è¡?ã??"
 
 #: ../mail/mail.error.xml.h:112
 msgid ""
@@ -14361,15 +13173,20 @@ msgstr ""
 "é??è¦?æ??ï¼?è«?ç§»è?³æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ï¼?ä»¥æ??å??æ?¹å¼?æ?°å¢?å®?ã??"
 
 #: ../mail/mail.error.xml.h:114
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr "å? ç?ºä½ æ²?æ??å??ç?¨é?¸æ??ç?¨ä¾?å¯?é??ç??å¸³è??ï¼?æ??ä»¥ç?¡æ³?å?³é??æ¤é?µä»¶ã??"
 
 #: ../mail/mail.error.xml.h:115
-msgid "This message cannot be sent because you have not specified any recipients"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "å? ç?ºä½ æ²?æ??æ??å®?ä»»ä½?æ?¶ä»¶è??ï¼?æ??ä»¥ç?¡æ³?å?³é??æ¤é?µä»¶"
 
 #: ../mail/mail.error.xml.h:116
-msgid "This server does not support this type of authentication and may not support authentication at all."
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr "æ¤ä¼ºæ??å?¨ä¸?æ?¯æ?´æ¤é©?è?é¡?å??è??ä¸?æ ¹æ?¬ä¸?æ?¯æ?´é©?è?ã??"
 
 #: ../mail/mail.error.xml.h:117
@@ -14377,7 +13194,9 @@ msgid "This signature has been changed, but has not been saved."
 msgstr "æ¤ç°½ç½²å·²ç¶?æ?´æ?¹ï¼?ä½?å°?æ?ªå?²å?ã??"
 
 #: ../mail/mail.error.xml.h:118
-msgid "This will mark all messages as read in the selected folder and its subfolders."
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 msgstr "é??æ??å°?æ¨?ç¤ºé?¸å®?ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
 
 #: ../mail/mail.error.xml.h:119
@@ -14385,7 +13204,9 @@ msgid "Unable to connect to the GroupWise server."
 msgstr "ç?¡æ³?é?£ç·?è?³ GroupWise ä¼ºæ??å?¨ã??"
 
 #: ../mail/mail.error.xml.h:120
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 msgstr "ç?¡æ³?é??å??æ¤å¸³è??ç??è??ç¨¿è³?æ??å¤¾ã??æ?¯å?¦ä½¿ç?¨ç³»çµ±è??ç¨¿è³?æ??å¤¾ä»£æ?¿ï¼?"
 
 #: ../mail/mail.error.xml.h:121
@@ -14402,12 +13223,17 @@ msgstr "ä½¿ç?¨é ?è¨ç??è??ç¨¿è³?æ??å¤¾ï¼?"
 
 #: ../mail/mail.error.xml.h:124
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
 "è¦å??ï¼?å¾?æ??å°?è³?æ??å¤¾ä¸å?ªé?¤é?µä»¶å°?æ??è?ªä½ ç??æ?¬å?°æ??é? ç«¯è³?æ??å¤¾å?ªé?¤å¯¦é??ç??é?µä»¶ã??\n"
 "æ?¯å?¦ç¢ºå®?è¦?é??éº¼å??ï¼?"
 
+#: ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "ä½ æ²?æ??è¶³å¤ ç??æ¬?é??å?ªé?¤æ¤å°?é?µä»¶ã??"
+
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "ä½ æ²?æ??å¡«å?¥æ??æ??å¿?é ?ç??è³?è¨?ã??"
@@ -14431,7 +13257,8 @@ msgstr "ä½ å¿?é ?æ??å®?ä¸?å??è³?æ??å¤¾ã??"
 #: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 "ä½ å¿?é ?è?³å°?æ??å®?ä¸?å??è³?æ??å¤¾ç?¶æ??ä¾?æº?ã??\n"
 "å??å?¥é?¸å??è³?æ??å¤¾ï¼?ç?¶å¾?/æ??é?¸å??æ??æ??æ?¬å?°è³?æ??å¤¾ã??æ??æ??é? ç«¯è³?æ??å¤¾æ??äº?è??ç??é?¸ã??"
@@ -14452,6 +13279,11 @@ msgstr "æ?¾æ£?æ?´æ?¹(_D)"
 msgid "_Do not Synchronize"
 msgstr "ä¸?è¦?å??æ¥(_D)"
 
+#: ../mail/mail.error.xml.h:138
+#: ../modules/mail/e-mail-shell-view-actions.c:941
+msgid "_Empty Trash"
+msgstr "æ¸?ç??å??æ?¶ç?(_E)"
+
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "æ¸?é?¤(_E)"
@@ -14460,89 +13292,98 @@ msgstr "æ¸?é?¤(_E)"
 msgid "_Open Messages"
 msgstr "é??å??é?µä»¶(_O)"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1122
 msgid "Unseen"
 msgstr "æ?ªé?±è®?"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1123
 msgid "Seen"
 msgstr "å·²é?±è®?"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1124
 msgid "Answered"
 msgstr "å·²å??è¦?"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1125
 msgid "Forwarded"
 msgstr "è½?å¯?"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1126
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å??æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1127
 msgid "Multiple Messages"
 msgstr "å¤?å??é?µä»¶"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1131
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1132
 msgid "Lower"
 msgstr "ä½?"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1136
 msgid "Higher"
 msgstr "é«?"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1137
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1654
-#: ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1661
-#: ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "ä»?å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1670
+#: ../mail/message-list.c:1763
 msgid "Yesterday %l:%M %p"
 msgstr "æ?¨å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1682
+#: ../mail/message-list.c:1775
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1690
+#: ../mail/message-list.c:1783
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p %l:%M"
 
-#: ../mail/message-list.c:1692
+#: ../mail/message-list.c:1785
 msgid "%b %d %Y"
 msgstr "%Y/%m/%d"
 
+#: ../mail/message-list.c:2537
+msgid "Select all visible messages"
+msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?µä»¶"
+
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:652
+msgid "Shell Backend"
+msgstr "Shell å¾?ç«¯ç¨?å¼?"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3987
-#: ../mail/message-list.c:4462
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4885
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4299
-msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+#: ../mail/message-list.c:4720
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
 msgstr "æ²?æ??é?µä»¶ç¬¦å??ä½ ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4301
-msgid "There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."
+#: ../mail/message-list.c:4722
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
 msgstr "å?¨é??å??è³?æ??å¤¾ä¸å?ªæ??é?±è??ç??é?µä»¶ã??ä½¿ç?¨ æª¢è¦?->é¡¯ç¤ºé?±è??ç??é?µä»¶ ä¾?é¡¯ç¤ºå®?å??ã??"
 
-#: ../mail/message-list.c:4303
+#: ../mail/message-list.c:4724
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??å¤¾ä¸æ²?æ??é?µä»¶ã??"
 
@@ -14571,7 +13412,6 @@ msgid "Sent Messages"
 msgstr "å?³é??é?µä»¶"
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 #: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "å¤§å°?"
@@ -14580,62 +13420,28 @@ msgstr "å¤§å°?"
 msgid "Subject - Trimmed"
 msgstr "ä¸»æ?¨ - å·²æ?ªç?"
 
-#: ../mail/message-tag-followup.c:54
-msgid "Call"
-msgstr "å??å§?ä½?ç½®"
-
-#: ../mail/message-tag-followup.c:55
-msgid "Do Not Forward"
-msgstr "è«?å?¿è½?å¯?"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Follow-Up"
-msgstr "è·?é?¨"
-
-#: ../mail/message-tag-followup.c:57
-msgid "For Your Information"
-msgstr "çµ¦ä½ ç??è³?è¨?"
-
-#: ../mail/message-tag-followup.c:58
-#: ../ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "è½?å¯?"
-
-#: ../mail/message-tag-followup.c:59
-msgid "No Response Necessary"
-msgstr "ä¸?é??è¦?å??æ??"
-
-#: ../mail/message-tag-followup.c:62
-#: ../ui/evolution-mail-message.xml.h:76
-msgid "Reply"
-msgstr "å??è¦?"
-
-#: ../mail/message-tag-followup.c:63
-#: ../ui/evolution-mail-message.xml.h:77
-msgid "Reply to All"
-msgstr "å?¨é?¨å??è¦?"
-
-#: ../mail/message-tag-followup.c:64
-msgid "Review"
-msgstr "æª¢é?±"
-
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Body contains"
 msgstr "å?§æ??å??å?«"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Message contains"
 msgstr "é?µä»¶å??å?«"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "Sender contains"
 msgstr "å¯?ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "Subject contains"
 msgstr "ä¸»æ?¨å??å?«"
 
@@ -14643,13 +13449,2044 @@ msgstr "ä¸»æ?¨å??å?«"
 msgid "Subject or Addresses contains"
 msgstr "ä¸»æ?¨æ??é?»å?é?µä»¶ä½?å??å??å?«"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Recipients contains"
-msgstr "ä¸»æ?¨æ??æ?¶ä»¶è??å??å?«"
+#: ../modules/addressbook/addressbook-config.c:206
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??ä½ ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ SSL)ã??"
+
+#: ../modules/addressbook/addressbook-config.c:208
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??ä½ ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ TLS)ã??"
+
+#: ../modules/addressbook/addressbook-config.c:210
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?ä½ ç??ä¼ºæ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??è¡¨ç¤ºä½ ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?ä½ ç??å®?å?¨æ??æ¼?æ´?ã?? "
+
+#: ../modules/addressbook/addressbook-config.c:592
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "ç?¨æ?¼ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥è¡?äº?æ??(_B)"
+
+#: ../modules/addressbook/addressbook-config.c:628
+msgid "Copy _book content locally for offline operation"
+msgstr "è¤?è£½é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥(_B)"
+
+#: ../modules/addressbook/addressbook-config.c:736
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr "é??æ?¯ LDAP ä¼ºæ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??è©¦é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?æ´½è©¢ä½ ç??ç³»çµ±ç®¡ç??å?¡ï¼?ç?è§£ä½ æ??è©²æ??å®?ç??å? ã??"
+
+#: ../modules/addressbook/addressbook-config.c:810
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr "é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è?ä½ ç??æ?¹æ³?ã??æ³¨æ??è¦?è¨å®?æ¤é ?è?³ã??é?»å?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿å??å?å??ä½ ç?? LDAP ä¼ºæ??å?¨ã??"
+
+#: ../modules/addressbook/addressbook-config.c:885
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr "æ??å°?ç¯?å??æ??å®?ç¾©ä½ æ?³å¾?ç¶²çµ¡ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??\"sub\" ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??ä¸?å??ã??ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
+
+#: ../modules/addressbook/addressbook-config.c:991
+msgid "Server Information"
+msgstr "ä¼ºæ??å?¨è³?è¨?"
+
+#: ../modules/addressbook/addressbook-config.c:996
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Details"
+msgstr "è©³ç´°è³?æ??"
+
+#: ../modules/addressbook/addressbook-config.c:997
+msgid "Searching"
+msgstr "æ£å?¨æ??å°?"
+
+#: ../modules/addressbook/addressbook-config.c:999
+msgid "Downloading"
+msgstr "ä¸?è¼?ä¸"
+
+#: ../modules/addressbook/addressbook-config.c:1205
+msgid "Address Book Properties"
+msgstr "é??è¨?é??å?§å®¹"
+
+#: ../modules/addressbook/addressbook-config.c:1207
+msgid "New Address Book"
+msgstr "æ?°é??è¨?é??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "è?ªå??å®?æ??é?·åº¦"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+msgid "Contact layout style"
+msgstr "è?¯çµ¡äººé??ç½®æ?¹å¼?"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr "è?¯çµ¡äººé ?è¦½çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+msgid "Contact preview pane position (vertical)"
+msgstr "è?¯çµ¡äººé ?è¦½çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "å®?æ?? uris æ¸?å?®ç?? EFolderList xml"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "å®?æ?? uris æ¸?å?®ç?? EFolderList xml"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr "æ?¹å??ç?ºæ°´å¹³æ??è?¯çµ¡äººé ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr "æ?¹å??ç?ºå??ç?´æ??è?¯çµ¡äººé ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "é¡¯ç¤ºè?ªå??è£?é½?ç??å§?å??è??ä½?å??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "é¡¯ç¤ºé ?è¦½çª?æ ¼"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr "é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨è?¯çµ¡äººæ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨è?¯çµ¡äººæ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨è?¯çµ¡äººæ¸?å?®æ??é??ã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "å?¨ Evolution å??è©¦è?ªå??å®?æ??ä¹?å??ï¼?å¿?é ?è¼¸å?¥ç??å?ç¬¦æ?¸ç?®ã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "ä¸?æ¬¡ç?¨æ?¼é?¸å??å??ç¨±å°?è©±ç??ç??è³?æ??å¤¾ URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "ä¸?æ¬¡ç?¨æ?¼é?¸å??å??ç¨±å°?è©±ç??ç??è³?æ??å¤¾ URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr "æ?¯å?¦å¼·å?¶é¡¯ç¤ºå?¨é ?ç?®ä¸è?ªå??è£?é½?ç??è?¯çµ¡äººå§?å??è??é?»å?é?µä»¶ä½?å??ã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "æ?¯å?¦é¡¯ç¤ºé ?è¦½çª?æ ¼ã??"
+
+#: ../modules/addressbook/autocompletion-config.c:159
+msgid "Table column:"
+msgstr "è¡¨æ ¼æ¬?ï¼?"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "è?ªå??å®?æ??"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+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
+msgid "On LDAP Servers"
+msgstr "å?¨ LDAP ä¼ºæ??å?¨"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "è?¯çµ¡äºº(_C)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:763
+msgid "Create a new contact"
+msgstr "å»ºç«?æ?°ç??è?¯çµ¡äºº"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+msgctxt "New"
+msgid "Contact _List"
+msgstr "è?¯çµ¡äººæ¸?å?®(_L)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:770
+msgid "Create a new contact list"
+msgstr "å»ºç«?æ?°ç??è?¯çµ¡äººæ¸?å?®"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "é??è¨?é??(_B)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:693
+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
+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
+#, fuzzy
+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:613
+#: ../modules/calendar/e-task-shell-content.c:635
+#: ../modules/mail/e-mail-shell-content.c:688
+msgid "Preview is Visible"
+msgstr "é ?è¦½ç?ºé¡¯ç¤ºç??æ??"
+
+#: ../modules/addressbook/e-book-shell-content.c:385
+#: ../modules/calendar/e-memo-shell-content.c:614
+#: ../modules/calendar/e-task-shell-content.c:636
+#: ../modules/mail/e-mail-shell-content.c:689
+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 ""
+"Evolution è?¯çµ¡äººè³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±æ?´æ?¹äº?ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#: ../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"
+"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../mail/searchtypes.xml.h:8
-msgid "Subject or Sender contains"
-msgstr "ä¸»æ?¨æ??å¯?ä»¶è??å??å?«"
+#: ../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 ""
+"Evolution å?²å?é?¨ä»½é?»è©±è??ç¢¼ç??æ?¹å¼?å·²ç¶?æ?´æ?¹ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#: ../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 ""
+"Evolution ç?? Palm Sync æ?´æ?¹è¨?é??å??æ? å°?æª?æ¡?å·²ç¶?æ?´æ?¹ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?ä½ ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç?å??..."
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:181
+#: ../modules/calendar/e-cal-shell-sidebar.c:608
+#: ../modules/calendar/e-memo-shell-sidebar.c:543
+#: ../modules/calendar/e-task-shell-sidebar.c:541
+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-view-actions.c:262
+#: ../modules/addressbook/e-book-shell-view-actions.c:539
+msgid "Save as vCard"
+msgstr "å?²å?ç?º vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:670
+msgid "Co_py All Contacts To..."
+msgstr "è¤?è£½æ??æ??ç??è?¯çµ¡äººå?°(_P)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:672
+msgid "Copy the contacts of the selected address book to another"
+msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??è?¯çµ¡äººè¤?è£½å?°å?¦ä¸?å??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:677
+msgid "D_elete Address Book"
+msgstr "å?ªé?¤é??è¨?é??(_E)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:679
+msgid "Delete the selected address book"
+msgstr "å?ªé?¤é?¸å??ç??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:684
+msgid "Mo_ve All Contacts To..."
+msgstr "å°?æ??æ??ç??è?¯çµ¡äººç§»å?°(_V)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:686
+msgid "Move the contacts of the selected address book to another"
+msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??è?¯çµ¡äººç§»å??å?°å?¦ä¸?å??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:691
+msgid "_New Address Book"
+msgstr "æ?°å¢?é??è¨?é??(_N)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:698
+msgid "Address _Book Properties"
+msgstr "é??è¨?é??å±¬æ?§(_B)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:700
+msgid "Show properties of the selected address book"
+msgstr "é¡¯ç¤ºé?¸å??é??è¨?é??ç??å±¬æ?§"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:705
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
+msgid "_Rename..."
+msgstr "é??æ?°å?½å??(_R)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:707
+msgid "Rename the selected address book"
+msgstr "é??æ?°å?½å??é?¸å??ç??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:712
+msgid "S_ave Address Book as vCard"
+msgstr "å°?é??è¨?é??å?¦å?ç?º vC_ard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:714
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??è?¯çµ¡äººå?²å?ç?º vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:721
+msgid "Stop loading"
+msgstr "å??æ¢è¼?å?¥"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:726
+msgid "_Copy Contact To..."
+msgstr "è¤?è£½è?¯çµ¡äººå?°(_C)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:728
+msgid "Copy selected contacts to another address book"
+msgstr "å°?é?¸å??ç??è?¯çµ¡äººè¤?è£½å?°å?¦ä¸?å??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:733
+msgid "_Delete Contact"
+msgstr "å?ªé?¤è?¯çµ¡äºº(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:740
+msgid "_Find in Contact..."
+msgstr "å?¨è?¯çµ¡äººå?§å°?æ?¾(_F)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:742
+msgid "Search for text in the displayed contact"
+msgstr "æ??å°?é¡¯ç¤ºç??è?¯çµ¡äººä¸ç??æ??å?"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:747
+msgid "_Forward Contact..."
+msgstr "è½?å¯?è?¯çµ¡äºº(_F)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:749
+msgid "Send selected contacts to another person"
+msgstr "å?³é??é?¸å??è?¯çµ¡äººçµ¦å?¶ä»?ä½¿ç?¨è??ã??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:754
+msgid "_Move Contact To..."
+msgstr "å°?è?¯çµ¡äººç§»å?°(_M)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:756
+msgid "Move selected contacts to another address book"
+msgstr "å°?é?¸å??ç??è?¯çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:761
+msgid "_New Contact..."
+msgstr "æ?°å¢?è?¯çµ¡äºº(_N)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:768
+msgid "New Contact _List..."
+msgstr "æ?°å¢?è?¯çµ¡äººæ¸?å?®(_L)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:775
+msgid "_Open Contact"
+msgstr "é??å??è?¯çµ¡äºº(_O)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:777
+msgid "View the current contact"
+msgstr "æª¢è¦?ç?®å??ç??è?¯çµ¡äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:782
+msgid "_Send Message to Contact..."
+msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:784
+msgid "Send a message to the selected contacts"
+msgstr "å?³é??é?µä»¶è?³é?¸å??ç??è?¯çµ¡äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:791
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "_Actions"
+msgstr "å??ä½?(_A)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
+msgid "_Preview"
+msgstr "é ?è¦½(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-task-shell-view-actions.c:833
+msgid "_Delete"
+msgstr "å?ªé?¤(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
+msgid "_Properties"
+msgstr "å±¬æ?§(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
+msgid "_Save as vCard..."
+msgstr "å?²å?æ?? _vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Contact _Preview"
+msgstr "è?¯çµ¡äººé ?è¦½(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show contact preview window"
+msgstr "é¡¯ç¤ºè?¯çµ¡äººé ?è¦½è¦?çª?"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
+#: ../modules/calendar/e-memo-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../modules/mail/e-mail-shell-view-actions.c:1241
+msgid "_Classic View"
+msgstr "å?³çµ±æª¢è¦?(_C)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+msgid "Show contact preview below the contact list"
+msgstr "å?¨è?¯çµ¡äººæ¸?å?®ä¸?æ?¹é¡¯ç¤ºè?¯çµ¡äººé ?è¦½"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/mail/e-mail-shell-view-actions.c:1248
+msgid "_Vertical View"
+msgstr "å??ç?´æª¢è¦?(_V)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+msgid "Show contact preview alongside the contact list"
+msgstr "å?¨è?¯çµ¡äººæ¸?å?®æ??é??é¡¯ç¤ºè?¯çµ¡äººé ?è¦½"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+msgid "Any Category"
+msgstr "ä»»ä½?å??é¡?"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../modules/calendar/e-memo-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:961
+msgid "Unmatched"
+msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../shell/e-shell-content.c:516
+msgid "Advanced Search"
+msgstr "é?²é??æ??å°?"
+
+# zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
+#: ../modules/addressbook/e-book-shell-view-actions.c:935
+msgid "Print all shown contacts"
+msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
+
+# zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??é?£çµ¡äºº"
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
+msgid "Preview the contacts to be printed"
+msgstr "é ?è¦½å°?è¦?å??å?°ç??é?£çµ¡äºº"
+
+# zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+msgid "Print selected contacts"
+msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:964
+msgid "Save as vCard..."
+msgstr "å?²å?ç?º vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
+msgid "Save selected contacts as a vCard"
+msgstr "å°?é?¸å??ç??è?¯çµ¡äººå?²å?ç?º vCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:338
+msgid "_Forward Contacts"
+msgstr "è½?å¯?è?¯çµ¡äºº(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:340
+msgid "_Forward Contact"
+msgstr "è½?å¯?è?¯çµ¡äºº(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:371
+msgid "_Send Message to Contacts"
+msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)"
+
+#: ../modules/addressbook/e-book-shell-view.c:373
+msgid "_Send Message to List"
+msgstr "å?³é??é?µä»¶çµ¦æ¸?å?®(_S)"
+
+#: ../modules/addressbook/e-book-shell-view.c:375
+msgid "_Send Message to Contact"
+msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)"
+
+#: ../modules/addressbook/eab-composer-util.c:137
+msgid "Multiple vCards"
+msgstr "å¤?é?? vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:145
+#, c-format
+msgid "vCard for %s"
+msgstr "%s ç?? vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
+#, c-format
+msgid "Contact information"
+msgstr "è?¯çµ¡äººè³?è¨?"
+
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information for %s"
+msgstr "%s ç??è?¯çµ¡äººè³?è¨?"
+
+#: ../modules/addressbook/ldap-config.ui.h:1
+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"
+
+#: ../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
+msgid "B_rowse this book until limit reached"
+msgstr "ç??è¦½é??å??é??è¨?é??ç?´å?°é??å?¶(_R)"
+
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "Lo_gin:"
+msgstr "ç?»å?¥(_G):"
+
+#. 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
+#, fuzzy
+msgid "One"
+msgstr "ç?¡(_O)"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search Filter"
+msgstr "æ??å°?é??æ¿¾å?¨"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _base:"
+msgstr "æ??å°?èµ·é»?(_B):"
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid "Search _filter:"
+msgstr "æ??å°?é??æ¿¾å?¨(_F):"
+
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr "æ??å°?é??æ¿¾å?¨æ?¯å?¨é?²è¡?æ??å°?æ??ä½¿ç?¨ç??ç?©ä»¶é¡?å??ã??å¦?æ??æ¤é ?æ²?æ??è¢«ä¿®æ?¹ï¼?é ?è¨ç??æ??å°?ç?®æ¨?æ?¯ã??personã??ç?©ä»¶é¡?å??ã??"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:19
+#, fuzzy
+msgid "Sub"
+msgstr "ä¸?æ¨?"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "Supported Search Bases"
+msgstr "æ?¯æ?´ç??æ??å°?èµ·é»?"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Using distinguished name (DN)"
+msgstr "ä½¿ç?¨è¾¨èª?ç??å??ç¨± (DN)"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "Using email address"
+msgstr "ä½¿ç?¨é?»å?é?µä»¶å?°å??"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Download limit:"
+msgstr "ä¸?è¼?é??å?¶(_D):"
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Find Possible Search Bases"
+msgstr "å°?æ?¾å?¯è?½ç??æ??å°?å?ºç¤?(_F)"
+
+#: ../modules/addressbook/ldap-config.ui.h:26
+msgid "_Login method:"
+msgstr "ç?»å?¥æ?¹æ³?(_L):"
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Port:"
+msgstr "é?£æ?¥å? (_P):"
+
+#: ../modules/addressbook/ldap-config.ui.h:29
+msgid "_Search scope:"
+msgstr "æ??å°?ç¯?å??(_S):"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Timeout:"
+msgstr "æ??é??(_T):"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "_Use secure connection:"
+msgstr "ä½¿ç?¨å®?å?¨é?£ç·?(_U):"
+
+#: ../modules/addressbook/ldap-config.ui.h:33
+msgid "cards"
+msgstr "å?¡ç??"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "å?¯å?¥(_M)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "é?¸æ??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "é?¸æ??å·¥ä½?æ¸?å?®"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "å?¯å?¥è?³è¡?äº?æ??(_M)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+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-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:113
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "å?¨ç¶²ç«?ä¸?"
+
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../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
+msgid "Birthdays & Anniversaries"
+msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "_Appointment"
+msgstr "ç´?æ??(_A)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+msgid "Create a new appointment"
+msgstr "å»ºç«?ä¸?å??æ?°ç??ç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "å?¨æ?¥ç´?æ??(_P)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new all-day appointment"
+msgstr "å»ºç«?æ?°ç??å?¨æ?¥ç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-backend.c:460
+msgctxt "New"
+msgid "M_eeting"
+msgstr "æ??è°(_E)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:462
+msgid "Create a new meeting request"
+msgstr "å»ºç«?æ?°æ??è°è¦?æ±?"
+
+#: ../modules/calendar/e-cal-shell-backend.c:470
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "è¡?äº?æ??(_N)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1281
+msgid "Create a new calendar"
+msgstr "å»ºç«?æ?°è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2644
+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 ""
+"Evolution è¡?äº?æ??è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±æ?´æ?¹äº?ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#. 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:152
+#: ../modules/calendar/e-memo-shell-sidebar.c:149
+#: ../modules/calendar/e-task-shell-sidebar.c:147
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"%s ç?¼ç??é?¯èª¤\n"
+"%s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:185
+msgid "Loading calendars"
+msgstr "æ£å?¨è¼?å?¥è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:425
+msgid "Calendar Selector"
+msgstr "è¡?äº?æ??é?¸æ??å?¨"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:598
+msgid "Date Navigator Widget"
+msgstr "æ?¥æ??ç??è¦½è¦?çª?å??ä»¶"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:599
+msgid "This widget displays a miniature calendar"
+msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºä¸?å??å°?å??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:609
+msgid "This widget displays groups of calendars"
+msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºè¡?äº?æ??ç??ç¾£çµ?"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:770
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "é??å??å?¨ %s ç??è¡?äº?æ??"
+
+# zh_HK: msgstr "å??å?°"
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+msgid "Print"
+msgstr "å??å?°"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr "æ¤ä½?æ¥æ??æ°¸ä¹?æ?§å?ªé?¤æ¯?é?¸å??æ??é??é??è??ç??æ??æ??äº?ä»¶ã??å¦?æ??ä½ ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?äº?ä»¶ã??"
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
+msgid "Purge events older than"
+msgstr "æ¸?é?¤æ?©æ?¼é??æ®µæ??é??ç??äº?ä»¶"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:540
+msgid "Copying Items"
+msgstr "è¤?è£½é ?ç?®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:795
+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:1097
+msgid "event"
+msgstr "äº?ä»¶"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1099
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:507
+#: ../modules/calendar/e-task-shell-view-actions.c:632
+msgid "Save as iCalendar"
+msgstr "å?²å?ç?º iCalendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
+msgid "_Copy..."
+msgstr "è¤?è£½(_C)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+msgid "D_elete Calendar"
+msgstr "å?ªé?¤è¡?äº?æ??(_E)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+msgid "Delete the selected calendar"
+msgstr "å?ªé?¤é?¸å??ç??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+msgid "Go Back"
+msgstr "å??å¾?"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+msgid "Go Forward"
+msgstr "å??å??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+msgid "Select _Today"
+msgstr "é?¸æ??ä»?å¤©(_T)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+msgid "Select today"
+msgstr "é?¸å??ä»?æ?¥"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+msgid "Select _Date"
+msgstr "é?¸æ??æ?¥æ??(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+msgid "Select a specific date"
+msgstr "é?¸å??ç?¹å®?æ?¥æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1279
+msgid "_New Calendar"
+msgstr "æ?°å¢?è¡?äº?æ??(_N)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-task-shell-view-actions.c:804
+msgid "Purg_e"
+msgstr "æ¸?é?¤(_E)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+msgid "Purge old appointments and meetings"
+msgstr "å?ªé?¤è??ç´?æ??å??æ??è°"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-task-shell-view-actions.c:748
+msgid "Re_fresh"
+msgstr "é??æ?°æ?´ç??(_F)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+msgid "Refresh the selected calendar"
+msgstr "é??æ?°æ?´ç??é?¸å??ç??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+msgid "Rename the selected calendar"
+msgstr "é??æ?°å?½å??é?¸å??ç??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+msgid "Show _Only This Calendar"
+msgstr "å?ªé¡¯ç¤ºé??å??è¡?äº?æ??(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+msgid "Cop_y to Calendar..."
+msgstr "è¤?è£½è?³è¡?äº?æ??(_Y)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+msgid "_Delegate Meeting..."
+msgstr "å§?æ´¾æ??è°(_D)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+msgid "_Delete Appointment"
+msgstr "å?ªé?¤ç´?æ??(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+msgid "Delete selected appointments"
+msgstr "å?ªé?¤é?¸å??ç??ç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#, fuzzy
+msgid "Delete This _Occurrence"
+msgstr "å?ªé?¤é??å??äº?ä»¶(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+msgid "Delete this occurrence"
+msgstr "å?ªé?¤æ¤é?±æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#, fuzzy
+msgid "Delete All Occ_urrences"
+msgstr "æ?¯å?¦å?ªé?¤æ??æ??ç??ä¾¿æ¢?ï¼?"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+msgid "Delete all occurrences"
+msgstr "å?ªé?¤å?¨é?¨é?±æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+msgid "New All Day _Event..."
+msgstr "æ?°å¢?å?¨å¤©äº?ä»¶(_E)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+msgid "Create a new all day event"
+msgstr "å»ºç«?æ?°ç??å?¨å¤©äº?ä»¶"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-task-shell-view-actions.c:713
+msgid "_Forward as iCalendar..."
+msgstr "ä»¥ iCale_ndar è½?å¯?..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+msgid "New _Meeting..."
+msgstr "æ?°å¢?æ??è°(_M)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+msgid "Create a new meeting"
+msgstr "å»ºç«?æ?°ç??æ??è°"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+msgid "Mo_ve to Calendar..."
+msgstr "ç§»è?³è¡?äº?æ??(_V)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+msgid "New _Appointment..."
+msgstr "æ?°å¢?ç´?æ??(_A)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+msgid "Make this Occurrence _Movable"
+msgstr "å°?é??å??äº?ä»¶æ¨?ç¤ºæ??å?¯ç§»å??(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+msgid "_Open Appointment"
+msgstr "é??å??ç´?æ??(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+msgid "View the current appointment"
+msgstr "æª¢è¦?ç?®å??ç??ç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+msgid "_Reply"
+msgstr "å??è¦?(_R)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+msgid "Save as iCalendar..."
+msgstr "å?²å?ç?º iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+msgid "_Schedule Meeting..."
+msgstr "æ??è°æ??ç¨?(_S)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+msgid "Converts an appointment to a meeting"
+msgstr "å°?ç´?æ??è½?æ??ç?ºæ??è°"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+msgid "Conv_ert to Appointment..."
+msgstr "è½?æ??ç?ºç´?æ??(_E)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "Converts a meeting to an appointment"
+msgstr "å°?æ??è°è½?æ??ç?ºç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+msgid "Day"
+msgstr "å¤©"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+msgid "Show one day"
+msgstr "é¡¯ç¤ºä¸?å¤©"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+msgid "List"
+msgstr "æ¸?å?®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+msgid "Show as list"
+msgstr "é¡¯ç¤ºæ??æ¸?å?®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+msgid "Month"
+msgstr "æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+msgid "Show one month"
+msgstr "é¡¯ç¤ºä¸?å??æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+msgid "Week"
+msgstr "é?±"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+msgid "Show one week"
+msgstr "é¡¯ç¤ºä¸?é?±"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+msgid "Show one work week"
+msgstr "é¡¯ç¤ºä¸?å??å·¥ä½?é?±"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+msgid "Active Appointments"
+msgstr "é?²è¡?ä¸ç??ç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+msgid "Next 7 Days' Appointments"
+msgstr "æ?ªä¾? 7 å¤©ç??ç´?æ??(_P)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-memo-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:985
+msgid "Description contains"
+msgstr "æ??è¿°å??å?«"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:793
+#: ../modules/calendar/e-task-shell-view-actions.c:992
+msgid "Summary contains"
+msgstr "ä¸»æ?¨å??å?«"
+
+# zh_HK: msgstr "å??å?°é??å??è¡?äº?æ??"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+msgid "Print this calendar"
+msgstr "å??å?°é??å??è¡?äº?æ??"
+
+# zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+msgid "Preview the calendar to be printed"
+msgstr "é ?è¦½å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+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:505
+msgid "memo"
+msgstr "å??å¿?é??"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
+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:647
+msgid "Create a new memo"
+msgstr "å»ºç«?æ?°ç??å??å¿?é??"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:652
+msgid "_Open Memo"
+msgstr "é??å??å??å¿?é??(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+msgid "View the selected memo"
+msgstr "æª¢è¦?é?¸å??ç??å??å¿?é??"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-task-shell-view-actions.c:797
+msgid "Open _Web Page"
+msgstr "é??å??ç¶²é ?(_W)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:819
+msgid "Print the selected memo"
+msgstr "æ??å?°é?¸å??ç??å??å¿?é??"
+
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:630
+msgid "task"
+msgstr "å·¥ä½?"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:692
+msgid "_Assign Task"
+msgstr "æ??æ´¾å·¥ä½?(_A)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:769
+msgid "_Mark as Complete"
+msgstr "æ¨?ç¤ºç?ºå®?æ??(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+msgid "Mark selected tasks as complete"
+msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?ç¤ºæ??å®?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+msgid "_Mark as Incomplete"
+msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
+msgid "Mark selected tasks as incomplete"
+msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?ç¤ºæ??æ?ªå®?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:783
+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:785
+msgid "Create a new task"
+msgstr "å»ºç«?ä¸?å??æ?°ç??å·¥ä½?"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:790
+msgid "_Open Task"
+msgstr "é??å??å·¥ä½?(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+msgid "View the selected task"
+msgstr "æª¢è¦?é?¸å??ç??å·¥ä½?"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:834
+#: ../modules/calendar/e-task-shell-view-actions.c:1033
+msgid "_Save as iCalendar..."
+msgstr "å?²å?ç?º iCalendar[_S]..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
+msgid "Print the selected task"
+msgstr "æ??å?°é?¸å??ç??å·¥ä½?"
+
+#: ../modules/calendar/e-memo-shell-backend.c:318
+msgctxt "New"
+msgid "Mem_o"
+msgstr "å??å¿?é??(_O)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "å?±ç?¨å??å¿?é??(_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:327
+msgid "Create a new shared memo"
+msgstr "å»ºç«?æ?°ç??å?±ç?¨å??å¿?é??"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "å??å¿?é??æ¸?å?®(_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+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:604
+msgid "The memo table model"
+msgstr "å??å¿?é??è¡¨æ ¼æ¨¡å??"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:182
+msgid "Loading memos"
+msgstr "æ£å?¨è¼?å?¥å??å¿?é??"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:396
+msgid "Memo List Selector"
+msgstr "å??å¿?é??æ¸?å?®é?¸æ??å?¨"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:544
+msgid "This widget displays groups of memo lists"
+msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºå??å¿?é??æ¸?å?®ç??ç¾£çµ?"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:697
+#, c-format
+msgid "Opening memos at %s"
+msgstr "é??å??å?¨ %s ç??å??å¿?é??"
+
+# zh_HK: msgstr "å??å?°å??å¿?é??"
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+msgid "Print Memos"
+msgstr "å??å?°å??å¿?é??"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
+msgid "_Delete Memo"
+msgstr "å?ªé?¤å??å¿?é??(_D)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
+msgid "_Find in Memo..."
+msgstr "å?¨å??å¿?é??å?§å°?æ?¾(_F)..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+msgid "Search for text in the displayed memo"
+msgstr "æ??å°?é¡¯ç¤ºç??å??å¿?é??ä¸ç??æ??å?"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+msgid "D_elete Memo List"
+msgstr "å?ªé?¤å??å¿?é??æ¸?å?®(_E)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+msgid "Delete the selected memo list"
+msgstr "å?ªé?¤é?¸å??ç??å??å¿?é??æ¸?å?®"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+msgid "_New Memo List"
+msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+msgid "Refresh the selected memo list"
+msgstr "é??æ?°æ?´ç??é?¸å??ç??å??å¿?é??æ¸?å?®"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+msgid "Rename the selected memo list"
+msgstr "é??æ?°å?½å??é?¸å??ç??å??å¿?é??æ¸?å?®"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+msgid "Show _Only This Memo List"
+msgstr "å?ªé¡¯ç¤ºæ¤å??å¿?é??æ¸?å?®(_O)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
+msgid "Memo _Preview"
+msgstr "å??å¿?é??é ?è¦½(_P)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
+msgid "Show memo preview pane"
+msgstr "é¡¯ç¤ºå??å¿?é??é ?è¦½çª?æ ¼"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+msgid "Show memo preview below the memo list"
+msgstr "å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå??å¿?é??é ?è¦½"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+msgid "Show memo preview alongside the memo list"
+msgstr "å?¨å??å¿?é??æ¸?å?®æ??é??é¡¯ç¤ºå??å¿?é??é ?è¦½"
+
+# zh_HK: msgstr "å??å?°å??å¿?é??æ¸?å?®"
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+msgid "Print the list of memos"
+msgstr "å??å?°å??å¿?é??æ¸?å?®"
+
+# zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
+msgid "Preview the list of memos to be printed"
+msgstr "é ?è¦½å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:413
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d é ?å??å¿?é??"
+msgstr[1] "%d é ?å??å¿?é??"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:417
+#: ../modules/calendar/e-task-shell-view-private.c:567
+#, c-format
+msgid "%d selected"
+msgstr "å·²é?¸æ?? %d å??"
+
+#: ../modules/calendar/e-memo-shell-view.c:223
+msgid "Delete Memos"
+msgstr "å?ªé?¤å??å¿?é??"
+
+#: ../modules/calendar/e-memo-shell-view.c:225
+msgid "Delete Memo"
+msgstr "å?ªé?¤å??å¿?é??"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
+msgctxt "New"
+msgid "_Task"
+msgstr "å·¥ä½?(_T)"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
+
+#: ../modules/calendar/e-task-shell-backend.c:331
+msgid "Create a new assigned task"
+msgstr "å»ºç«?æ?°æ??å®?ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "å·¥ä½?æ¸?å?®(_K)"
+
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+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:626
+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 ""
+"Evolution å·¥ä½?è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.xå¾?å°±æ?´æ?¹äº?ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?ä½ ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#. 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:180
+msgid "Loading tasks"
+msgstr "æ£å?¨è¼?å?¥å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:394
+msgid "Task List Selector"
+msgstr "å·¥ä½?æ¸?å?®é?¸æ??å?¨"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:542
+msgid "This widget displays groups of task lists"
+msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºå·¥ä½?æ¸?å?®ç??ç¾£çµ?"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:695
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "é??å??å?¨ %s ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:264
+msgid "Print Tasks"
+msgstr "æ??å?°å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:574
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"é??å??å??ä½?æ??æ°¸ä¹?å?°æ¸?é?¤æ??æ??æ¨?ç¤ºç?ºå·²å®?æ??ç??å·¥ä½?ã??å¦?æ??ä½ è¦?ç¹¼çº?ï¼?ä½ å°?ä¸?è?½å¾©å??é??äº?å·¥ä½?ã??\n"
+"\n"
+"ç¢ºå®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:699
+msgid "_Delete Task"
+msgstr "å?ªé?¤å·¥ä½?(_D)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:706
+msgid "_Find in Task..."
+msgstr "å?¨å·¥ä½?å?§å°?æ?¾(_F)..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+msgid "Search for text in the displayed task"
+msgstr "æ??å°?é¡¯ç¤ºç??å·¥ä½?ä¸ç??æ??å?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:720
+msgid "Copy..."
+msgstr "è¤?è£½..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:727
+msgid "D_elete Task List"
+msgstr "å?ªé?¤å·¥ä½?æ¸?å?®(_E)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+msgid "Delete the selected task list"
+msgstr "å?ªé?¤é?¸å??ç??å·¥ä½?æ¸?å?®"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:734
+msgid "_New Task List"
+msgstr "æ?°å¢?å·¥ä½?æ¸?å?®(_N)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+msgid "Refresh the selected task list"
+msgstr "é??æ?°æ?´ç??é?¸å??ç??å·¥ä½?æ¸?å?®"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:757
+msgid "Rename the selected task list"
+msgstr "é??æ?°å?½å??é?¸å??ç??å·¥ä½?æ¸?å?®"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:762
+msgid "Show _Only This Task List"
+msgstr "å?ªé¡¯ç¤ºæ¤å·¥ä½?æ¸?å?®(_O)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:776
+msgid "Mar_k as Incomplete"
+msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_K)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:806
+msgid "Delete completed tasks"
+msgstr "å?ªé?¤å·²å®?æ??ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:881
+msgid "Task _Preview"
+msgstr "å·¥ä½?é ?è¦½(_P)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:883
+msgid "Show task preview pane"
+msgstr "é¡¯ç¤ºå·¥ä½?é ?è¦½çª?æ ¼"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:904
+msgid "Show task preview below the task list"
+msgstr "å?¨å·¥ä½?æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå·¥ä½?é ?è¦½"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+msgid "Show task preview alongside the task list"
+msgstr "å?¨å·¥ä½?æ¸?å?®æ??é??é¡¯ç¤ºå·¥ä½?é ?è¦½"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+msgid "Active Tasks"
+msgstr "é?²è¡?ä¸ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Completed Tasks"
+msgstr "å·²å®?æ??ç??å·¥ä½? "
+
+#: ../modules/calendar/e-task-shell-view-actions.c:940
+msgid "Next 7 Days' Tasks"
+msgstr "æ?ªä¾? 7 å¤©ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:947
+msgid "Overdue Tasks"
+msgstr "é??æ??ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:954
+msgid "Tasks with Attachments"
+msgstr "æ??é??ä»¶ç??å·¥ä½?"
+
+# zh_HK: msgstr "å??å?°å·¥ä½?æ¸?å?®"
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
+msgid "Print the list of tasks"
+msgstr "å??å?°å·¥ä½?æ¸?å?®"
+
+# zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
+msgid "Preview the list of tasks to be printed"
+msgstr "é ?è¦½å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
+
+#: ../modules/calendar/e-task-shell-view-private.c:461
+msgid "Expunging"
+msgstr "é?¤å?»ä¸"
+
+#: ../modules/calendar/e-task-shell-view-private.c:563
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d é ?å·¥ä½?"
+msgstr[1] "%d é ?å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view.c:351
+msgid "Delete Tasks"
+msgstr "å?ªé?¤å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view.c:353
+msgid "Delete Task"
+msgstr "å?ªé?¤å·¥ä½?"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, 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
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../modules/mail/e-mail-shell-backend.c:168
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "é?µä»¶è¨?æ?¯(_M)"
+
+#: ../modules/mail/e-mail-shell-backend.c:170
+msgid "Compose a new mail message"
+msgstr "ç·¨è¼¯æ?°ç??é?µä»¶è¨?æ?¯"
+
+#: ../modules/mail/e-mail-shell-backend.c:178
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "é?µä»¶è³?æ??å¤¾(_F)"
+
+#: ../modules/mail/e-mail-shell-backend.c:180
+msgid "Create a new mail folder"
+msgstr "å»ºç«?æ?°é?µä»¶è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-backend.c:199
+msgid "Mail Accounts"
+msgstr "é?µä»¶å¸³è??"
+
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Mail Preferences"
+msgstr "é?µä»¶å??å¥½è¨å®?"
+
+#: ../modules/mail/e-mail-shell-backend.c:215
+msgid "Composer Preferences"
+msgstr "é?µä»¶ç·¨è¼¯å?¨å??å¥½è¨å®?"
+
+#: ../modules/mail/e-mail-shell-backend.c:223
+msgid "Network Preferences"
+msgstr "ç¶²çµ¡å??å¥½è¨å®?"
+
+#: ../modules/mail/e-mail-shell-content.c:678
+msgid "Group by Threads"
+msgstr "æ ¹æ??ç?¸é??é?µä»¶ç?ºç¾£çµ?"
+
+#: ../modules/mail/e-mail-shell-content.c:679
+msgid "Whether to group messages by threads"
+msgstr "æ?¯å?¦æ ¹æ??ç?¸é??é?µä»¶ä»¥ç¾£çµ?æ?¹å¼?é¡¯ç¤º"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view.c:526
+msgid "_Disable Account"
+msgstr "å??ç?¨å¸³è??(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:915
+msgid "Disable this account"
+msgstr "å??ç?¨é??å??å¸³è??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:920
+msgid "C_reate Search Folder From Search..."
+msgstr "å¾?æ??å°?å»ºç«?æ??å°?è³?æ??å¤¾(_R)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:927
+msgid "_Download Messages for Offline Usage"
+msgstr "ä¸?è¼?é?¢ç·?ä½¿ç?¨ç??é?µä»¶(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:929
+msgid "Download messages of accounts and folders marked for offline"
+msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??å¸³è??/è³?æ??å¤¾ä¹?é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:934
+msgid "Empty _Trash"
+msgstr "æ¸?ç??å??æ?¶ç?(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:936
+#: ../modules/mail/e-mail-shell-view-actions.c:943
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "æ°¸ä¹?ç§»é?¤å?¨æ??æ??è³?æ??å¤¾å?§ç??å·²å?ªé?¤ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:948
+msgid "Fl_ush Outbox"
+msgstr "æ¸?ç??å¯?ä»¶å?£(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:955
+msgid "_Copy Folder To..."
+msgstr "è¤?è£½è³?æ??å¤¾å?°(_C)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:957
+msgid "Copy the selected folder into another folder"
+msgstr "è¤?è£½å·²é?¸å®?ç??è³?æ??å¤¾å?°å?¦ä¸?å??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:964
+msgid "Permanently remove this folder"
+msgstr "æ°¸ä¹?ç§»é?¤é??å??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:969
+msgid "E_xpunge"
+msgstr "å?ªé?¤(_X)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:971
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "æ°¸ä¹?ç§»é?¤å?¨é??å??è³?æ??å¤¾å?§å·²å?ªé?¤ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+msgid "Mar_k All Messages as Read"
+msgstr "æ¨?ç¤ºæ??æ??é?µä»¶ç?ºå·²é?±è®?(_K)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:978
+msgid "Mark all messages in the folder as read"
+msgstr "å°?è³?æ??å¤¾ä¸å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:983
+msgid "_Move Folder To..."
+msgstr "ç§»å??è³?æ??å¤¾å?°(_M)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:985
+msgid "Move the selected folder into another folder"
+msgstr "å°?é?¸å®?ç??è³?æ??å¤¾ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:990
+msgid "_New..."
+msgstr "æ?°å¢?(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:992
+msgid "Create a new folder for storing mail"
+msgstr "å»ºç«?ä¸?å??æ?°è³?æ??å¤¾ä»¥å?²å?é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:999
+msgid "Change the properties of this folder"
+msgstr "æ?´æ?¹é??å??è³?æ??å¤¾ç??å±¬æ?§"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
+msgid "Refresh the folder"
+msgstr "é??æ?°è¼?å?¥è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
+msgid "Change the name of this folder"
+msgstr "æ?´æ?¹é??å??è³?æ??å¤¾ç??å??ç¨±"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1018
+msgid "Select Message _Thread"
+msgstr "é?¸æ??é?µä»¶æª?é (_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
+msgid "Select all messages in the same thread as the selected message"
+msgstr "é?¸æ??æ??æ??ç?¸é??ç??é?µä»¶ç?ºé?¸å®?ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1025
+msgid "Select Message S_ubthread"
+msgstr "é?¸æ??é?µä»¶å?ç¾£çµ?(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
+msgid "Select all replies to the currently selected message"
+msgstr "é?¸æ??æ??æ??å??è¦?é?¸å®?é?µä»¶ç??ä¿¡"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
+msgid "_Unsubscribe"
+msgstr "å??æ¶?è¨?é?±(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
+msgid "Unsubscribe from the selected folder"
+msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1039
+msgid "_New Label"
+msgstr "æ?°å¢?æ¨?ç±¤(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1046
+msgid "N_one"
+msgstr "æ²?æ??(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1053
+msgid "Hide _Read Messages"
+msgstr "é?±è??å·²é?±è®?ç??é?µä»¶(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1055
+msgid "Temporarily hide all messages that have already been read"
+msgstr "å°?å·²é?±è®?ç??é?µä»¶æ?«æ??é?±è??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1060
+msgid "Hide S_elected Messages"
+msgstr "é?±è??é?¸æ??ç??é?µä»¶(_E)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1062
+msgid "Temporarily hide the selected messages"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ?«æ??é?±è??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
+msgid "Show Hidde_n Messages"
+msgstr "é¡¯ç¤ºé?±è??ç??é?µä»¶(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1069
+msgid "Show messages that have been temporarily hidden"
+msgstr "é¡¯ç¤ºæ?«æ??é?±è??ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1090
+msgid "Cancel the current mail operation"
+msgstr "å??æ¶?ç?®å??é?µä»¶æ??ä½?ç??è¡?å??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+msgid "Collapse All _Threads"
+msgstr "æ?¶æ?ºæ??æ??ç?¸é??é?µä»¶(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
+msgid "Collapse all message threads"
+msgstr "æ?¶æ?ºæ??æ??ç??ç?¸é??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1102
+msgid "E_xpand All Threads"
+msgstr "å±?é??æ??æ??ç?¸é??é?µä»¶(_X)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1104
+msgid "Expand all message threads"
+msgstr "å±?é??æ??æ??ç??ç?¸é??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
+msgid "_Message Filters"
+msgstr "é?µä»¶è¦?å??(_M)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1111
+msgid "Create or edit rules for filtering new mail"
+msgstr "ç?ºæ?°é?µä»¶å»ºç«?æ??ç·¨è¼¯é??æ¿¾è¦?å??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1116
+msgid "Search F_olders"
+msgstr "æ??å°?è³?æ??å¤¾(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1118
+msgid "Create or edit search folder definitions"
+msgstr "å»ºç«?æ??ç·¨è¼¯æ??å°?è³?æ??å¤¾ç??å®?ç¾©"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1123
+msgid "_Subscriptions..."
+msgstr "è¨?é?±(_S)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1125
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "è¨?é?±æ??å??æ¶?è¨?é?±å?¨é? ç«¯ä¼ºæ??å?¨ç??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1132
+msgid "F_older"
+msgstr "è³?æ??å¤¾(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
+msgid "_Label"
+msgstr "æ¨?ç±¤(_L)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1179
+msgid "_New Folder..."
+msgstr "æ?°å¢?è³?æ??å¤¾(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
+msgid "Hide _Deleted Messages"
+msgstr "é?±è??å·²å?ªé?¤é?µä»¶(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??ä»¥å?ªé?¤ç·?ç??å½¢å¼?é¡¯ç¤º"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
+msgid "Show Message _Preview"
+msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½(_P)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1214
+msgid "Show message preview pane"
+msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½çª?æ ¼"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
+msgid "_Group By Threads"
+msgstr "æ ¹æ??ç?¸é??é?µä»¶ç?ºç¾£çµ?(_G)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
+msgid "Threaded message list"
+msgstr "ç?¸é??é?µä»¶æ¸?å?®"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
+msgid "Show message preview below the message list"
+msgstr "å?¨é?µä»¶æ¸?å?®ä¸?æ?¹é¡¯ç¤ºé?µä»¶é ?è¦½"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
+msgid "Show message preview alongside the message list"
+msgstr "å?¨é?µä»¶æ¸?å?®æ??é??é¡¯ç¤ºé?µä»¶é ?è¦½"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
+msgid "All Messages"
+msgstr "æ??æ??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1265
+msgid "Important Messages"
+msgstr "é??è¦?é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
+msgid "Last 5 Days' Messages"
+msgstr "æ??è¿? 5 å¤©ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
+msgid "Messages Not Junk"
+msgstr "é??å??å?¾é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
+msgid "Messages with Attachments"
+msgstr "æ??é??ä»¶ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1293
+msgid "No Label"
+msgstr "ç?¡æ¨?ç±¤"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
+msgid "Read Messages"
+msgstr "å·²è®?é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
+msgid "Recent Messages"
+msgstr "æ??è¿?ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
+msgid "Unread Messages"
+msgstr "æ?ªè®?é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
+msgid "Subject or Addresses contain"
+msgstr "ä¸»æ?¨æ??é?»å?é?µä»¶ä½?å??å??å?«"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+msgid "All Accounts"
+msgstr "æ??æ??ç??å¸³è??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1383
+msgid "Current Account"
+msgstr "ç?®å??ç??å¸³è??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1390
+msgid "Current Folder"
+msgstr "ç?®å??ç??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-private.c:836
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
+msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
+
+#: ../modules/mail/e-mail-shell-view-private.c:847
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d å°?å·²å?ªé?¤"
+msgstr[1] "%d å°?å·²å?ªé?¤"
+
+#: ../modules/mail/e-mail-shell-view-private.c:853
+#: ../modules/mail/e-mail-shell-view-private.c:860
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d å°?å??å?¾"
+msgstr[1] "%d å°?å??å?¾"
+
+#: ../modules/mail/e-mail-shell-view-private.c:866
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d å??è??ç¨¿"
+msgstr[1] "%d å??è??ç¨¿"
+
+#: ../modules/mail/e-mail-shell-view-private.c:872
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d å°?æ?ªå?³é??"
+msgstr[1] "%d å°?æ?ªå?³é??"
+
+#: ../modules/mail/e-mail-shell-view-private.c:878
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d å°?å·²å?³é??"
+msgstr[1] "%d å°?å·²å?³é??"
+
+#: ../modules/mail/e-mail-shell-view-private.c:890
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d å°?æ?ªè®?ï¼?"
+msgstr[1] "%d å°?æ?ªè®?ï¼?"
+
+#: ../modules/mail/e-mail-shell-view-private.c:893
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "å?± %d å°?"
+msgstr[1] "å?± %d å°?"
+
+#: ../modules/mail/e-mail-shell-view.c:524
+msgid "Proxy _Logout"
+msgstr "ç?»å?ºä»£ç??ä¼ºæ??å?¨(_L)"
+
+#: ../modules/mail/em-composer-prefs.c:473
+msgid "Language(s)"
+msgstr "èª?è¨?"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "æ¯?æ¬¡"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "æ¯?å¤©ä¸?æ¬¡"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "æ¯?é?±ä¸?æ¬¡"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "æ¯?æ??ä¸?æ¬¡"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "å? å?¥è?ªé?¸å??å?¾é?µä»¶æª?é "
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "æ¨?é å??ç¨±:"
+
+#: ../modules/mail/em-mailer-prefs.c:226
+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
+msgid "Header"
+msgstr "é ?é¦?"
+
+#: ../modules/mail/em-mailer-prefs.c:329
+msgid "Contains Value"
+msgstr "å??å?«æ?¸å?¼"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#, 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
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?ä½¿ç?¨ã??è«?æª¢æ?¥æ?¯å?¦æ??å®?è£?è©²å¥?ä»¶ã??"
+
+#: ../modules/mail/em-mailer-prefs.c:766
+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
+msgid "_Date header:"
+msgstr "æ?¥æ??æ¨?é (_D):"
+
+#: ../modules/mail/em-mailer-prefs.c:1154
+msgid "Show _original header value"
+msgstr "é¡¯ç¤ºå??å§?æ¨?é æ?¸å?¼(_O)"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Python å¤?æ??ç¨?å¼?è¼?å?¥ç¨?å¼?æ¸¬è©¦"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python æ¸¬è©¦å¤?æ??ç¨?å¼?"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python EPlugin è¼?å?¥ç¨?å¼?ç??æ¸¬è©¦å¤?æ??ç¨?å¼?ã??"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
@@ -14660,73 +15497,77 @@ msgid "Local Address Books"
 msgstr "æ?¬å?°ç«¯é??è¨?é??"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "List of clues for the attachment reminder plugin to look for in a message body"
-msgstr "è®?é??å? æª?æ¡?æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå?æ¸?å?®"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"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 "è®?é??å? æª?æ¡?æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå?æ¸?å?®ã??"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr "è®?é??ä»¶æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå?æ¸?å?®ã??"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:389
+#: ../plugins/attachment-reminder/attachment-reminder.c:514
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "é??é?µå?"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Attachment Reminder"
-msgstr "é??å? æª?æ¡?æ??é??ç¨?å¼?"
-
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr "ç?¶ä½ å¿?è¨?å°?é??ä»¶å? å?¥é?µä»¶æ??æ??é??ä½ ã??"
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr "Evolution å·²æ?¾å?°æ??äº?ä»£è¡¨è©²é?µä»¶æ??å?«æ??é??ä»¶ç??é??é?µå?ï¼?å?»æ?¾ä¸?å?°é??å??é??ä»¶ã??"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
-msgstr "Evolution å·²æ?¾å?°æ??äº?ä»£è¡¨è©²é?µä»¶æ??å?«æ??é??å? æª?æ¡?ç??é??é?µå?ï¼?å?»æ?¾ä¸?å?°é??å??é??å? æª?æ¡?ã??"
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
-msgstr "é?µä»¶æ²?æ??é??å? æª?æ¡?"
+msgstr "é?µä»¶æ²?æ??é??ä»¶"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
 msgstr "æ?°å¢?é??ä»¶(_A)..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "ç·¨è¼¯é?µä»¶(_E)"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "é??ä»¶æ??é??ç¨?å¼?"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "ç?¶ä½ å¿?è¨?å°?é??ä»¶å? å?¥é?µä»¶æ??æ??é??ä½ ã??"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Audio Inline"
+msgid "Inline Audio"
 msgstr "è¡?å?§é?³æ??"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly from Evolution."
-msgstr "å¾? Evolution ç?´æ?¥æ?æ?¾é?³æ??é??ä»¶ã??"
+msgid "Play audio attachments directly in mail messages."
+msgstr "ç?´æ?¥æ?æ?¾é?µä»¶ä¸ç??é?³æ??é??ä»¶ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "é?¸æ?? Evolution å??ä»½æª?æ¡?ç??å??ç¨±"
 
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
-msgstr "å??ä»½å¾?é??æ?°å??å?? E_volution"
+msgstr "å??ä»½å¾?é??æ?°å??å?? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:209
 msgid "Select name of the Evolution backup file to restore"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution å??ä»½æª?æ¡?å??ç¨±"
 
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
-msgstr "å??å?å¾?é??æ?°å??å?? E_volution"
+msgstr "é??å??å¾?é??æ?°å??å?? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:287
-msgid "Restore from backup"
-msgstr "å¾?å??ä»½é??å??"
-
-#: ../plugins/backup-restore/backup-restore.c:289
-msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
+#: ../plugins/backup-restore/backup-restore.c:290
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr "ä½ å?¯ä»¥å¾?å??ä»½ä¸é??å?? Evolutionã??å®?å?¯ä»¥é??å??æ??æ??ç??é?µä»¶ã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??ã??è?¯çµ¡äººã??å®?ä¹?å?¯ä»¥é??å??ä½ æ??æ??ç??å??äººè¨å®?ã??é?µä»¶é??æ¿¾å?¨ç?ã??"
 
 #: ../plugins/backup-restore/backup-restore.c:297
@@ -14741,13 +15582,33 @@ msgstr "é?¸æ??è¦?é??å??ç?? Evolution æª?æ¡?åº«ï¼?"
 msgid "Choose a file to restore"
 msgstr "é?¸æ??è¦?é??å??ç??æª?æ¡?"
 
+#: ../plugins/backup-restore/backup-restore.c:315
+msgid "Restore from backup"
+msgstr "å¾?å??ä»½é??å??"
+
+#: ../plugins/backup-restore/backup-restore.c:353
+msgid "_Backup Settings..."
+msgstr "å??ä»½è¨å®?å?¼(_B)..."
+
+#: ../plugins/backup-restore/backup-restore.c:355
+msgid "Backup Evolution data and settings to an archive file"
+msgstr "å°? Evolution ç??è³?æ??è??è¨å®?å?¼å??ä»½ç?ºæª?æ¡?åº«"
+
+#: ../plugins/backup-restore/backup-restore.c:360
+msgid "R_estore Settings..."
+msgstr "é??å??è¨å®?å?¼(_E)..."
+
+#: ../plugins/backup-restore/backup-restore.c:362
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "å¾?æª?æ¡?åº«é??å?? Evolution ç??è³?æ??è??è¨å®?å?¼"
+
 #: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "å??ä»½ Evolution ç?®é??"
 
 #: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
-msgstr "å??å? Evolution ç?®é??"
+msgstr "é??å?? Evolution ç?®é??"
 
 #: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
@@ -14804,42 +15665,42 @@ msgstr "ç§»é?¤æ?«å?ç??å??ä»½æª?æ¡?"
 msgid "Ensuring local sources"
 msgstr "æ£å?¨ç¢ºèª?æ?¬å?°ç«¯ä¾?æº?"
 
-#: ../plugins/backup-restore/backup.c:429
+#: ../plugins/backup-restore/backup.c:427
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ£å??ä»½è?³è³?æ??å¤¾ %s"
 
-#: ../plugins/backup-restore/backup.c:434
+#: ../plugins/backup-restore/backup.c:432
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "å¾?è³?æ??å¤¾é??å?? %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Backup"
 msgstr "Evolution å??ä»½"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Restore"
 msgstr "Evolution é??å??"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:487
 msgid "Backing up Evolution Data"
 msgstr "å??ä»½ Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:488
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å?¨ Evolution å??ä»½ä½ ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:490
 msgid "Restoring Evolution Data"
 msgstr "é??å?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:491
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å?¨ Evolution é??å??ä½ ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:511
+#: ../plugins/backup-restore/backup.c:509
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "é??å??å??ä½?æ??è?±ç??æ??é??å??æ±ºæ?¼ä½ ç??å¸³è??ä¸è³?æ??ç??å¤?å¯¡ã??"
 
@@ -14857,11 +15718,16 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "ç¢ºå®?è¦?é??é?? Evolutionï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "ç¢ºå®?è¦?å¾?é?¸å®?ç??å??ä»½æª?æ¡?é??å?? Evolutionï¼?"
 
 #: ../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."
+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 "Evolution å??ä»½å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å?¨é?²è¡?ä¹?å??è«?ç¢ºå®?ä½ å·²å?²å?ä¸¦é??é??æ??æ??æ?ªå?²å?ç??è¦?çª?ã??å¦?æ??å¸?æ?? Evolution å?¨å??ä»½å¾?è?ªå??é??æ?°å??å??ï¼?è«?å??ç?¨å??æ??æ??é??ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -14881,51 +15747,43 @@ msgid "The selected folder is not writable."
 msgstr "é?¸å??ç??è³?æ??å¤¾ç?¡æ³?å¯«å?¥ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-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."
+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."
 msgstr "é??å°?æ??å?ªé?¤æ??æ?? Evolution ç?®å??ç??è³?æ??è??è¨å®?å?¼ä¸¦å¾?å??ä»½ä¸é??å??å®?å??ã??Evolution é??å??å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å¦?æ??å¸?æ?? Evolution å?¨é??å??å¾?è?ªå??é??æ?°å??å??ï¼?è«?å??ç?¨å??æ??æ??é??ã??"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr "å??ä»½è??å??å? Evolution ç??è³?æ??è??è¨å®?å?¼"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "é??å??è¨å®?å?¼(_E)..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "å??ä»½è¨å®?å?¼(_B)..."
-
-#: ../plugins/bbdb/bbdb.c:622
-#: ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "è?ªå??å? å?¥ç??è?¯çµ¡äºº"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:646
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "å?¨å?³é??é?µä»¶æ??è?ªå??å»ºç«?é??è¨?é??é ?ç?®(_A)"
 
-#: ../plugins/bbdb/bbdb.c:652
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "é?¸æ??çµ¦è?ªå??å? å?¥è?¯çµ¡äººç?¨ç??é??è¨?é??"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "å?³æ??è¨?æ?¯è?¯çµ¡äºº"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:746
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "å®?æ??å¾? Pidgin ç??å¥½å??æ¸?å?®å??æ¥è?¯çµ¡äººè³?è¨?å??å??ç??"
 
-#: ../plugins/bbdb/bbdb.c:688
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "é?¸æ??çµ¦ Pidgin å¥½å??å??å?®ç?¨ç??é??è¨?é??"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "ç«?å?³è??å¥½å??æ¸?å?®å??æ¥(_B)"
 
@@ -14937,34 +15795,41 @@ msgstr "BBDB"
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 "ä¸?ç?¨å??å¤§è²»å?¨ç« ç®¡ç??ä½ ç??é??è¨?é??äº?ã??\n"
 "\n"
 "å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??ä¸å¡«å?¥å§?å??è??é?»å?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸å¡«å?¥ IM è?¯çµ¡äººè³?è¨?ã??"
 
-#. 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:158
 #, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr "Bogofilter å°?æ?ªå??å¦¥ã??è«?å??å®?è£?å®?ã??"
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "å?¨ç?¢ç?? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter å?ç¨?åº?æ²?æ??å??æ??ï¼?ä¸æ¢å®?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ç?å¾? Bogofilter å?ç¨?åº?ä¸æ?·ï¼?çµ?çµ?å®?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "å°?ç®¡è?³ Bogofilter å¤±æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%dã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "å°?é?µä»¶æ??å?è½?æ??ç?º _Unicode"
 
@@ -14973,7 +15838,9 @@ msgid "Convert mail messages to Unicode"
 msgstr "å°?é?µä»¶è½?æ??ç?º Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
 msgstr "å°?é?µä»¶æ??å?è½?æ??ç?º Unicode UTF-8 ä»¥çµ±ä¸?ä¾?è?ªä¸?å??å?é??ç?? spam/ham ç?¹å¾µã??"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -14988,39 +15855,133 @@ msgstr "Bogofilter é?¸é ?"
 msgid "Filter junk messages using Bogofilter."
 msgstr "ä½¿ç?¨ Bogofilter é??æ¿¾å??å?¾é?µä»¶ã??"
 
-#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-browse-server.c:198
+msgid "Authentication failed. Server requires correct login."
+msgstr "é©?è?å¤±æ??ã??ä¼ºæ??å?¨è¦?æ±?æ£ç¢ºç??ç?»å?¥ã??"
+
+#: ../plugins/caldav/caldav-browse-server.c:200
+msgid "Given URL cannot be found."
+msgstr "æ?¾ä¸?å?°æ??å®?ç?? URLã??"
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+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
+msgid "Failed to parse server response."
+msgstr "ç?¡æ³?å??æ??ä¼ºæ??å?¨ç??å??æ??ã??"
+
+#: ../plugins/caldav/caldav-browse-server.c:428
+msgid "Events"
+msgstr "äº?ä»¶"
+
+#: ../plugins/caldav/caldav-browse-server.c:450
+msgid "User's calendars"
+msgstr "ä½¿ç?¨è??ç??è¡?äº?æ??"
+
+#: ../plugins/caldav/caldav-browse-server.c:558
+#: ../plugins/caldav/caldav-browse-server.c:629
+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
+msgid "Searching for user's calendars..."
+msgstr "æ£å?¨æ??å°?ä½¿ç?¨è??ç??è¡?äº?æ??..."
+
+#: ../plugins/caldav/caldav-browse-server.c:666
+msgid "Could not find any user calendar."
+msgstr "æ?¾ä¸?å?°ä»»ä½?ä½¿ç?¨è??è¡?äº?æ??ã??"
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr "å??ä¸?æ¬¡ç??å??è©¦å¤±æ??ï¼?%s"
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr "å??ä¸?æ¬¡ç??å??è©¦å¤±æ??ä»£ç¢¼ç?º %d"
+
+#: ../plugins/caldav/caldav-browse-server.c:799
+#, c-format
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr "è¼¸å?¥ä½¿ç?¨è?? <b>%s</b> å?¨ä¼ºæ??å?¨ <b>%s</b> ä¸?ç??å¯?ç¢¼ "
+
+#: ../plugins/caldav/caldav-browse-server.c:856
+#, fuzzy, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+"ä¸?è?½å»ºç«?è¼¸å?ºæª?æ¡?ï¼?%sï¼?\n"
+" %s"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1091
+msgid "Searching folder content..."
+msgstr "æ??å°?è³?æ??å¤¾å?§å®¹..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1134
+msgid "List of available calendars:"
+msgstr "å?¯ç?¨ç??è¡?äº?æ??ç??æ¸?å?®ï¼?"
+
+#: ../plugins/caldav/caldav-browse-server.c:1171
+msgid "Supports"
+msgstr "æ?¯æ?´"
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, c-format
+msgid "Failed to create thread: %s"
+msgstr "ç?¡æ³?å»ºç«?å?·è¡?ç·?ï¼?%s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr "ä¼ºæ??å?¨ URLã??%sã??ä¸?æ?¯æ??æ??ç?? URL"
+
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr "ç??è¦½ CalDAV è¡?äº?æ??"
+
+#: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/caldav/caldav-source.c:402
 #: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "ç¶²å??(_U):"
 
-#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/caldav/caldav-source.c:426
 #: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "ä½¿ç?¨ _SSL"
 
+#: ../plugins/caldav/caldav-source.c:468
+msgid "Brows_e server for a calendar"
+msgstr "ç??è¦½ä¼ºæ??å?¨ç??è¡?äº?æ??(_E)"
+
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/caldav/caldav-source.c:480
 #: ../plugins/calendar-file/calendar-file.c:274
 #: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/calendar-weather/calendar-weather.c:501
 #: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/google-account-setup/google-source.c:717
 msgid "Re_fresh:"
 msgstr "é??æ?°æ?´ç??(_F):"
 
-#: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:743
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-msgid "weeks"
-msgstr "é?±"
-
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
 msgstr "å? å?¥ Evolution å°? CalDAV ç??æ?¯æ?´ã??"
@@ -15081,55 +16042,62 @@ msgstr "å°?ç¶²çµ¡è¡?äº?æ??å? å?¥ Evolutionã??"
 msgid "Web Calendars"
 msgstr "ç¶²çµ¡è¡?äº?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "å¤©æ°£ï¼?èµ·é?§"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "å¤©æ°£ï¼?å¤?é?²"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "å¤©æ°£ï¼?å¤?é?²ç??å¤?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "å¤©æ°£ï¼?å¤?é?²"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "å¤©æ°£ï¼?é?£é?¨"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "å¤©æ°£ï¼?ä¸?é?ª"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "å¤©æ°£ï¼?è?·é?½"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "å¤©æ°£ï¼?æ?´æ??ç??å¤?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "å¤©æ°£ï¼?é?·æ?´"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "é?¸æ??ä¸?å??ä½?ç½®"
 
-#: ../plugins/calendar-weather/calendar-weather.c:606
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:379
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../plugins/calendar-weather/calendar-weather.c:599
 msgid "_Units:"
 msgstr "å?®ä½?(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:613
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å??ç±³ç?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:614
+#: ../plugins/calendar-weather/calendar-weather.c:607
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(è?¯æ°?ã??å?¬å??ç?)"
 
@@ -15141,20 +16109,30 @@ msgstr "å? å?¥ Evolution å°?å¤©æ°£è¡?äº?æ??ç??æ?¯æ?´ã??"
 msgid "Weather Calendars"
 msgstr "æ°£è±¡è¡?äº?æ??"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid "Copy Tool"
-msgstr "è¤?è£½å·¥å?·"
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+msgid "Contacts map"
+msgstr "è?¯çµ¡äººå?°å??"
+
+#: ../plugins/contacts-map/contacts-map.c:56
+msgid "Show a map of all the contacts"
+msgstr "é¡¯ç¤ºæ??æ??è?¯çµ¡äººç??å?°å??"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy things to the clipboard."
-msgstr "å°?å?§å®¹è¤?è£½å?°å?ªè²¼ç°¿ã??"
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr "å?¨å?¯ä»¥ç??æ??å??å? å?¥ä¸?å¼µå?°å??ä¾?é¡¯ç¤ºè?¯çµ¡äººç??ä½?ç½®ã??"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+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 "æª¢æ?¥ Evolution æ?¯å?¦ç?ºé ?è¨ç??é?µä»¶ç¨?å¼?"
 
 #: ../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."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "æ¯?æ¬¡å??å?? Evolution æ??ï¼?æª¢æ?¥å®?æ?¯å?¦ç?ºé ?è¨ç??é?µä»¶ç¨?å¼?ã??"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
@@ -15169,24 +16147,23 @@ msgstr "é ?è¨é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "ä½ æ?¯å?¦è¦?å°? Evolution è¨ç?ºä½ ç??é ?è¨é?»å?é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?ï¼?"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:627
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../plugins/default-source/default-source.c:80
+#: ../plugins/default-source/default-source.c:94
 msgid "Mark as _default address book"
 msgstr "æ¨?ç¤ºç?ºé ?è¨é??è¨?é??(_D)"
 
-#: ../plugins/default-source/default-source.c:101
+#: ../plugins/default-source/default-source.c:119
+msgid "A_utocomplete with this address book"
+msgstr "ç?¨é??å??é??è¨?é??é?²è¡?è?ªå??å®?æ??(_U)"
+
+#: ../plugins/default-source/default-source.c:138
 msgid "Mark as _default calendar"
 msgstr "æ¨?ç¤ºç?ºé ?è¨è¡?äº?æ??(_D)"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:139
 msgid "Mark as _default task list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å·¥ä½?æ¸?å?®(_D)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:140
 msgid "Mark as _default memo list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å??å¿?é??æ¸?å?®(_D)"
 
@@ -15198,41 +16175,51 @@ msgstr "é ?è¨ä¾?æº?"
 msgid "Mark your preferred address book and calendar as default."
 msgstr "å°?ä½ å??å¥½ç??é??è¨?é??å??è¡?äº?æ??æ¨?è¨?ç?ºé ?è¨ã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:333
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "è?ªé?¸æ¨?é ç??æ¸?å?®"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr "é??å??é?µå?¼æ??å®?ç??æ?¯ä½ å?¯ä»¥å? å?°å¤?å¯?é?µä»¶ç??è?ªé?¸æ¨?é æ¸?å?®ã??æ??å®?æ¨?é è??æ¨?é æ?¸å?¼ç??æ ¼å¼?ç?ºï¼?è?ªé?¸æ¨?é å??ç¨±å? ä¸?ã??=ã??ï¼?å¾?é?¢ç??æ?¸å?¼å??ä»¥ã??;ã??é??é??"
+
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "å®?å?¨æ?§:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "æ?ªæ¸é¡?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "å·²ä¿?è·"
 
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Secret"
 msgstr "å¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Top secret"
 msgstr "æ¥µæ©?å¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "è?ªé?¸æ¨?é (_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:906
-msgid "Key"
-msgstr "è¨å®?é?µ"
-
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:395
-msgid "Values"
-msgstr "æ?¸å?¼"
-
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -15240,9 +16227,14 @@ msgstr ""
 "æ??å®?è?ªé?¸æ¨?é é?µå?¼ç??æ ¼å¼?ï¼?\n"
 "è?ªé?¸æ¨?é é?µå?¼ç??å??ç¨±è«?ä»¥ã??;ã??é??é??ã??"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "é?»å?é?µä»¶è?ªé?¸æ¨?é "
+#: ../plugins/email-custom-header/email-custom-header.c:948
+msgid "Key"
+msgstr "è¨å®?é?µ"
+
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+msgstr "æ?¸å?¼"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
@@ -15253,927 +16245,16 @@ msgstr "å?¨å¤?å¯?é?µä»¶ä¸å? å?¥è?ªé?¸æ¨?é ã??"
 msgid "Custom Header"
 msgstr "è?ªé?¸æ¨?é "
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "è?ªé?¸æ¨?é ç??æ¸?å?®"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
-msgstr "é??å??é?µå?¼æ??å®?ç??æ?¯ä½ å?¯ä»¥å? å?°å¤?å¯?é?µä»¶ç??è?ªé?¸æ¨?é æ¸?å?®ã??æ??å®?æ¨?é è??æ¨?é æ?¸å?¼ç??æ ¼å¼?ç?ºï¼?è?ªé?¸æ¨?é å??ç¨±å? ä¸?ã??=ã??ï¼?å¾?é?¢ç??æ?¸å?¼å??ä»¥ã??;ã??é??é??"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "é??å??å?¶ä»?ä½¿ç?¨è??ç??è³?æ??å¤¾"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "å¸³è??(_A):"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "è³?æ??å¤¾å??ç¨±(_F):"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "ä½¿ç?¨è??(_U):"
-
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "å®?å?¨å¯?ç¢¼"
-
-#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
-msgstr "æ¤é?¸é ?å°?æ??é?£æ?¥å?°ä½¿ç?¨å®?å?¨å¯?ç¢¼ (NTLM) é©?è?ç?? Exchange ä¼ºæ??å?¨ã??"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "ç´?æ??å?å¯?ç¢¼"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid "This option will connect to the Exchange server using standard plaintext password authentication."
-msgstr "æ¤é?¸é ?å°?æ??é?£æ?¥å?°ä½¿ç?¨æ¨?æº?ç´?æ??å?å¯?ç¢¼é©?è?ç?? Exchange ä¼ºæ??å?¨ã??"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-msgid "Out Of Office"
-msgstr "ä¸?å?¨è¾¦å?¬å®¤"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
-msgid ""
-"The message specified below will be automatically sent to \n"
-"each person who sends mail to you while you are out of the office."
-msgstr ""
-"ä»¥ä¸?æ??å®?ç??è¨?æ?¯å°?æ??è?ªå??å?³é??çµ¦\n"
-"æ¯?ä¸?ä½?å?¨ä½ é?¢é??è¾¦å?¬å®¤æ??å?³é??é?µä»¶çµ¦ä½ ç??äººã??"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:290
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am out of the office"
-msgstr "æ??ç?®å??ä¸?å?¨è¾¦å?¬å®¤"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:294
-msgid "I am in the office"
-msgstr "æ??ç?®å??å?¨è¾¦å?¬å®¤"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:340
-msgid "Change the password for Exchange account"
-msgstr "æ?¹è®? Exchange å¸³è??ç??å¯?ç¢¼"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:342
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "æ?´æ?¹å¯?ç¢¼"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
-msgid "Manage the delegate settings for Exchange account"
-msgstr "ç®¡ç?? Exchange å¸³è??ç??æ??æ¬?è¨å®?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-msgid "Delegation Assistant"
-msgstr "å§?æ´¾è¨å®?å?©ç??"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-msgid "Miscelleneous"
-msgstr "é??é ?"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:371
-msgid "View the size of all Exchange folders"
-msgstr "æª¢è¦?æ??æ?? Exchange è³?æ??å¤¾ç??å¤§å°?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:373
-msgid "Folders Size"
-msgstr "è³?æ??å¤¾å¤§å°?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:380
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "Exchange è¨å®?å?¼"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:726
-msgid "_OWA URL:"
-msgstr "_OWA URL:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:752
-msgid "A_uthenticate"
-msgstr "é©?è?(_U)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:774
-msgid "Mailbox name is _different than user name"
-msgstr "ä¿¡ç®±å??ç¨±è??ä½¿ç?¨è??å??ç¨±ä¸?å??(_D)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:787
-msgid "_Mailbox:"
-msgstr "ä¿¡ä»¶å?£(_M):"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1001
-msgid "_Authentication Type"
-msgstr "é©?è?é¡?å??(_A)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1130
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1132
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 KB"
-
-#. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1137
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "å¤§å°?:"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution è??æ?¼é?¢ç·?æ¨¡å¼?ã??ä½ ç?¾å?¨ä¸?è?½å»ºç«?æ??ä¿®æ?¹è³?æ??å¤¾ã??\n"
-"è«?å??æ??å?°ä¸?ç·?æ¨¡å¼?ä»¥é?²è¡?é??é¡?æ??ä½?ã??"
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid "The current password does not match the existing password for your account. Please enter the correct password"
-msgstr "ç?®å??ç??å¯?ç¢¼ä¸?ç¬¦å??å¸³è??ç??ç?¾å?å¯?ç¢¼ã??è«?è¼¸å?¥æ£ç¢ºç??å¯?ç¢¼"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "é??å?©å??å¯?ç¢¼ä¸?ä¸?æ¨£ã??è«?é??æ?°è¼¸å?¥å¯?ç¢¼ã??"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "ç¢ºèª?å¯?ç¢¼ï¼?"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "ç?®å??ç??å¯?ç¢¼ï¼?"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "æ?°å¯?ç¢¼ï¼?"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "ç?®å??ç??å¯?ç¢¼å·²é??æ??ã??è«?ç«?å?³æ?´æ?¹å¯?ç¢¼ã??"
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:657
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "ä½ ç??å¯?ç¢¼å°?å?¨ %d å¤©å¾?å?°æ??"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:142
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
-msgid "Custom"
-msgstr "è?ªé?¸"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:168
-msgid "Editor (read, create, edit)"
-msgstr "ç·¨è¼¯è?? (è®?å??ã??å»ºç«?ã??ç·¨è¼¯)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:172
-msgid "Author (read, create)"
-msgstr "å??è??è?? (è®?å??ï¼?å»ºç«?)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:176
-msgid "Reviewer (read-only)"
-msgstr "æª¢é?±è?? (å??é??è®?å??)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:225
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Delegate Permissions"
-msgstr "ä»£ç??äººæ¬?é??"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:236
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
-#, c-format
-msgid "Permissions for %s"
-msgstr "%s ç??æ¬?é??"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:326
-msgid "This message was sent automatically by Evolution to inform you that you have been designated as a delegate. You can now send messages on my behalf."
-msgstr "é??å°?é?µä»¶æ?¯ç?± Evolution è?ªå??å¯?å?ºä»¥é??ç?¥ä½ å·²ç¶?è¢«æ??æ´¾ç?ºä»£ç??äººã??ä½ ç?¾å?¨å?¯ä»¥ä»£è¡¨æ??å¯?ç?¼é?µä»¶ã??"
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:331
-msgid "You have been given the following permissions on my folders:"
-msgstr "ä½ å·²ç¶?å¾?å?°æ??ç??è³?æ??å¤¾ç??æ¬?é??æ??ï¼?"
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:351
-msgid "You are also permitted to see my private items."
-msgstr "ä½ ä¹?è¢«å??è¨±æ?¥ç??æ??ç??ç§?äººé ?ç?®ã??"
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
-msgid "However you are not permitted to see my private items."
-msgstr "ç?¶è??ä½ ä¸¦æ?ªå¾?å?°å??è¨±è§?ç??æ??ç??ç§?äººé ?ç?®ã??"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:390
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "ä½ å·²ç¶?è¢«æ??æ´¾ç?º %s ç??ä»£ç??äºº"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:416
-msgid "Delegate To"
-msgstr "å§?è¨?çµ¦"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:581
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "è¦?ç§»é?¤ä»£ç??äºº %s å??ï¼?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:698
-msgid "Could not access Active Directory"
-msgstr "ç?¡æ³?å?å?? Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:710
-msgid "Could not find self in Active Directory"
-msgstr "Active Directory ä¸æ?¾ä¸?å?°è?ªå·±"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:723
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "Active Directory ä¸æ?¾ä¸?å?°ä»£ç??äºº %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:735
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "ç?¡æ³?ç§»é?¤ä»£ç??äºº %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:795
-msgid "Could not update list of delegates."
-msgstr "ç?¡æ³?æ?´æ?°ä»£ç??äººç??æ¸?å?®ã??"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:813
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "ç?¡æ³?æ?°å¢?ä»£ç??äºº %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:980
-msgid "Error reading delegates list."
-msgstr "è®?å??ä»£ç??äººæ¸?å?®é?¯èª¤ã??"
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-msgid "C_alendar:"
-msgstr "è¡?äº?æ??(_A):"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Co_ntacts:"
-msgstr "è?¯çµ¡äºº(_N):"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegates"
-msgstr "ä»£ç??äºº"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid ""
-"None\n"
-"Reviewer (read-only)\n"
-"Author (read, create)\n"
-"Editor (read, create, edit)"
-msgstr ""
-"æ²?æ??\n"
-"æª¢é?±è?? (å??é??è®?å??)\n"
-"å??è??è?? (è®?å??ï¼?å»ºç«?)\n"
-"ç·¨è¼¯è?? (è®?å??ã??å»ºç«?ã??ç·¨è¼¯)"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Permissions for"
-msgstr "æ¬?é??æ??äº?"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-msgstr ""
-"é??é??ä½ çµ¦äº?é??äº?ä½¿ç?¨è??ç??æ¬?é??ï¼?ä»?å??å°?å?¯ä»¥ä»¥ä½ ç??èº«å??å?³é??é?µä»¶ï¼?\n"
-"ä¸¦å?å??ä½ ç??è³?æ??å¤¾ã??"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "ä»£ç??äººå?¯ä»¥æ?¥ç??ç§?äººç??é ?ç?®(_D)"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "æ?¶ä»¶å?£(_I):"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "æ¬?é??æ??è¦?(_S)"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks:"
-msgstr "å·¥ä½?(_T):"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "æ¬?é??..."
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "è³?æ??å¤¾å??ç¨±"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "è³?æ??å¤¾å¤§å°?"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-msgid "User"
-msgstr "ä½¿ç?¨è??"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??è³?æ??å¤¾"
-
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "Exchange è³?æ??å¤¾æ¨¹"
-
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:233
-#: ../plugins/exchange-operations/exchange-folder.c:243
-msgid "Unsubscribe Folder..."
-msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:518
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "ç¢ºå®?è¦?å??æ¶?è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:530
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "å??æ¶?è¨?é?±ã??%sã??"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>ç?®å??ä½ ç??ç??æ??æ?¯ã??ä¸?å?¨è¾¦å?¬å®¤ã??ã??</b>\n"
-"\n"
-"ä½ è¦?æ?´æ?¹ç??æ??ç?ºã??å?¨è¾¦å?¬å®¤ã??å??ï¼? "
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>ã??ä¸?å?¨è¾¦å?¬å®¤ã??è¨?æ?¯ï¼?</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>ç??æ??ï¼?</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>ç?¶ä½ ä¸?å?¨è¾¦å?¬å®¤æ??ï¼?ä»»ä½?å?³é??é?µä»¶çµ¦ä½ ç??äººé?½æ??æ?¶å?°\n"
-"ä»¥ä¸?æ??å®?ç??è¨?æ?¯ã??</small>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "æ??ç?®å??å?¨è¾¦å?¬å®¤"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "æ??ç?®å??ä¸?å?¨è¾¦å?¬å®¤"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "å?¦ï¼?è«?ä¸?è¦?æ?´æ?¹ç??æ??"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "å¤?å?ºå?©ç??"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "æ?¯ï¼?è«?æ?´æ?¹ç??æ??"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "å¯?ç¢¼å?°æ??è¦ç¤º..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "ä½ ç??å¯?ç¢¼å°?å?¨ 7 å¤©å?§å?°æ??..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "æ?´æ?¹å¯?ç¢¼(_D)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
-msgid "(Permission denied.)"
-msgstr "(æ¬?é??è¢«æ??çµ?ã??)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-msgid "Add User:"
-msgstr "æ?°å¢?ä½¿ç?¨è??ï¼?"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:932
-#: ../plugins/groupwise-features/share-folder.c:713
-msgid "Add User"
-msgstr "å? å?¥ä½¿ç?¨è??"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>æ¬?é??</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "ç?¡æ³?å?ªé?¤"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "ç?¡æ³?ç·¨è¼¯"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "å»ºç«?é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "å»ºç«?å?è³?æ??å¤¾"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "å?ªé?¤ä»»ä½?é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "å?ªé?¤è?ªå·±ç??é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "ç·¨è¼¯ä»»ä½?é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "ç·¨è¼¯è?ªå·±ç??é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "è³?æ??å¤¾è?¯çµ¡äºº"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "è³?æ??å¤¾æ??æ??è??"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "è³?æ??å¤¾é¡¯ç¤º"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "è®?å??é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "è§?è?²: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>é?µä»¶è¨å®?å?¼</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>è¿½è¹¤é?¸é ?</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "Exchange - å?³é??é?¸é ?"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "é??è¦?æ?§(_M):"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"ä¸?è?¬\n"
-"é«?\n"
-"ä½?"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"ä¸?è?¬\n"
-"å??äºº\n"
-"ç§?äºº\n"
-"æ©?å¯?"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "è¦?æ±?é??å°?é?µä»¶ç´¢å??é??é??å??æ¢?(_D)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "è¦?æ±?é??å°?é?µä»¶ç´¢å??è®?ä¿¡å??æ¢?(_R)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "ä»¥ä»£ç??äººèº«å??å¯?ä¿¡"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "æ??æ??åº¦(_S):"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "ä½¿ç?¨è??(_U)"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:134
-msgid "Select User"
-msgstr "é?¸æ??ä½¿ç?¨è??"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:172
-msgid "Address Book..."
-msgstr "é??è¨?é??..."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??è?¯çµ¡äºº"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??è¡?äº?æ??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "Activates the Evolution-Exchange extension package."
-msgstr "ä½¿ç?¨ Evolution-Exchange å»¶ä¼¸å¥?ä»¶ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "Exchange æ??ä½?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ä¸?è?½å?å??ã??Exchange è¨å®?å?¼ã??å??é ?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr "å? çµ?æ??å??é¡?è??ç?¡æ³?æ?´æ?¹å¯?ç¢¼ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "ç?¡æ³?é¡¯ç¤ºè³?æ??å¤¾ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "ç?¡æ³?å?·è¡?æ¤é ?æ??ä½?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
-msgstr "å°? Exchange å¸³è??ã??{0}ã??é?¸é ?ç??æ?´æ?¹å°?å?¨é??æ?°å??å?? Evolution ä¹?å¾?ç??æ??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "ç?¡æ³?é©?è?ä¼ºæ??å?¨ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "ç?¡æ³?æ?´æ?¹å¯?ç¢¼ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"ç?¡æ³?è¨å®? Exchange å¸³è??ï¼?å? ç?ºç?¼ç??äº?\n"
-"æ?ªç?¥ç??é?¯èª¤ã??è«?æª¢æ?¥ URLã??ä½¿ç?¨è??å??ç¨±\n"
-"ä»¥å??å¯?ç¢¼ï¼?ç?¶å¾?å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "ç?¡æ³?é?£æ?¥ Exchange ä¼ºæ??å?¨ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "ç?¡æ³?é?£ç·?å?°ä¼ºæ??å?¨ {0}ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "ç?¡æ³?æ±ºå®?å§?æ´¾ç??è³?æ??å¤¾æ¬?é??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "æ?¾ä¸?å?° Exchange ç¶²é ?å?²å?ç³»çµ±ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "ç?¡æ³?å®?ä½?ä¼ºæ??å?¨ {0}ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "ç?¡æ³?å°? {0} è¨ç?ºä»£ç??äºº"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "ç?¡æ³?è®?å??è³?æ??å¤¾æ¬?é??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "ç?¡æ³?è®?å??è³?æ??å¤¾æ¬?é??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "ç?¡æ³?è®?å??ã??ä¸?å?¨è¾¦å?¬å®¤ã??ç??æ??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "ç?¡æ³?æ?´æ?°è³?æ??å¤¾æ¬?é??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "ç?¡æ³?æ?´æ?°ã??ä¸?å?¨è¾¦å?¬å®¤ã??ç??æ??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr "Evolution è¦?æ±?é??æ?°å??å??ä»¥è¼?å?¥è¨?é?±ä½¿ç?¨è??ç??é?µä»¶ç®±"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "Exchange å¸³è??å·²é?¢ç·?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-msgid ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
-msgstr ""
-"Exchange Connector é??è¦?å?å?? Exchange \n"
-"ä¼ºæ??å?¨ä¸?ç??æ??äº?å??è?½ï¼?ä½?é??äº?å??è?½å·²é??é??\n"
-"æ??å·²å°?é??ã??(é??é??å¸¸ä¸?æ?¯å?»æ??ç??ã??)ä½ ç?? \n"
-"Exchange ç®¡ç??å?¡å°?é??è¦?é??å??æ¤å??è?½ï¼? \n"
-"è®?ä½ å?¯ä»¥ä½¿ç?¨ \n"
-"Evolution Exchange Connectorã??\n"
-"\n"
-"è?¥é??æ??é??æ??ä¾?çµ¦ä½ ç?? Exchange ç®¡ç??å?¡\n"
-"ç??è³?è¨?ï¼?è«?æ ¹æ??ä¸?å??é?£çµ?ï¼?\n"
-"\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "ç?¡æ³?æ?´æ?°å§?æ´¾ï¼?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "è³?æ??å¤¾å·²å?å?¨"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "è³?æ??å¤¾ä¸?å?å?¨"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "è³?æ??å¤¾é?¢ç·?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1259
-msgid "Generic error"
-msgstr "ä¸?è?¬é?¯èª¤"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "ç?¡æ³?é?£æ?¥å?¨å??å??é??ä¼ºæ??å?¨"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
-msgstr "å¦?æ?? OWA å?¨å?¥ç??è·¯å¾?å?·è¡?ï¼?ä½ å¿?é ?å?¨å¸³è??çµ?æ??å°?è©±ç??ä¸æ??å®?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "{0} ç??é?µä»¶ç®±ä¸¦ä¸?å?¨æ¤ä¼ºæ??å?¨ä¸?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "è«?ç¢ºå®? URL æ?¯æ£ç¢ºç??ï¼?ç?¶å¾?å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr "è«?ç¢ºå®?ä¼ºæ??å?¨å??ç¨±ç??æ?¼å?æ?¯æ£ç¢ºç??ï¼?ç?¶å¾?å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr "è«?ç¢ºå®?ä½¿ç?¨è??å??ç¨±å??å¯?ç¢¼æ?¯æ£ç¢ºç??ï¼?ç?¶å¾?å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "æ²?æ??ç?ºæ¤å¸³è??è¨å®?ã??å?¨å??å??é??ã??ä¼ºæ??å?¨ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "å?¨ {1} ä¸?æ²?æ??ä½¿ç?¨è?? {0} ç??é?µä»¶ç®±ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "æ?¥ç?¡æ¤ä½¿ç?¨è?? {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "å¯?ç¢¼å·²æ??å??ç??æ?´æ?¹ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr "è«?è¼¸å?¥ä»£ç??äººç?? ID æ??å??æ¶?ã??ä»¥ä»£ç??äººèº«å??å¯?ä¿¡ã??é?¸é ?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "è«?ç¢ºå®?å?¨å??å??é??ä¼ºæ??å?¨å??ç¨±æ?¯æ£ç¢ºç??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "è«?é??æ?°å??å?? Evolution ä»¥ä½¿æ?´æ?¹ç??æ??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "è«?é?¸å??ä¸?å??ä½¿ç?¨è??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "ä¼ºæ??å?¨æ??çµ?å¯?ç¢¼ï¼?å? ç?ºå®?å¤ªå®¹æ??è¢«ç ´è§£ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "Exchange å¸³è??å°?æ??å?¨ä½ é?¢é?? Evolution æ??å??ç?¨"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "Exchange å¸³è??å°?æ??å?¨ä½ çµ?æ?? Evolution æ??ç§»é?¤"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "æ¤ Exchange ä¼ºæ??å?¨ç?¡æ³?è?? Exchange Connector å?¼å®¹ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"æ¤ä¼ºæ??å?¨å?·è¡?ç??æ?¯ Exchange 5.5ã??Exchange Connector \n"
-"å??æ?¯æ?´ Microsoft Exchange 2000 å?? 2003ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-msgid ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
-msgstr ""
-"é??å?¯è?½è¡¨ç¤ºä½ ç??ä¼ºæ??å?¨è¦?æ±?ä½ æ??å®?\n"
-"Windows ç¶²å??å??ç¨±ä½?ç?ºä½ ç??ä½¿ç?¨è??å??ç¨±\n"
-"ç??ä¸?é?¨å??(ä¾?ï¼?&quot;DOMAIN\\user&quot;)ã??\n"
-"\n"
-"æ??è??å?¯è?½å?ªæ?¯ä½ æ??å¯?ç¢¼æ??é?¯äº?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "è«?ä½¿ç?¨ä¸?å??ç??å¯?ç¢¼å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "ç?¡æ³?å°?ä½¿ç?¨è??å? å?¥å?å??æ?§å?¶æ¸?å?®ï¼?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "ç?¡æ³?ç·¨è¼¯å§?ä»»ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unknown error looking up {0}"
-msgstr "æ?¥è©¢ {0} æ??ç?¼ç??ä¸?æ??ç??é?¯èª¤"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:624
-#: ../plugins/mail-to-task/mail-to-task.c:599
-#: ../plugins/mail-to-task/mail-to-task.c:821
-msgid "Unknown error."
-msgstr "ä¸?æ??ç??é?¯èª¤ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "ä¸?æ??ç??é¡?å??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr "ä½ å·²ç¶?æ?¥è¿?å?¨æ¤ä¼ºæ??å?¨å?²å?é?µä»¶ç?? quota é??é¡?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid "You are permitted to send a message on behalf of only one delegator at a time."
-msgstr "ä¸?å??ä»£ç??äººå?ªå??è¨±æ¯?æ¬¡å¯?å?ºä¸?å°?é?µä»¶ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "ä½ ç?¡æ³?å°?è?ªå·±è¨ç?ºä½ è?ªå·±ç??ä»£ç??äºº"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "ä½ å·²ç¶?è¶?é??äº?å?¨æ¤ä¼ºæ??å?¨å?²å?é?µä»¶ç?? quota é??é¡?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "ä½ å?¯ä»¥å?ªè¨å®?ä¸?å??å?®ä¸?ç?? Exchange å¸³è??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
-msgstr "ç?®å??ç??ä½¿ç?¨é??ç?ºï¼?{0} KBã??è«?å??è©¦å?ªé?¤ä¸?äº?é?µä»¶ä¾?ç©ºå?ºé?¨å??ç©ºé??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
-msgstr "ç?®å??ç??ä½¿ç?¨é??ç?ºï¼?{0} KBã??ä½ ç?¾å?¨å°?ç?¡æ³?å?³é??æ??æ?¥æ?¶é?µä»¶ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
-msgstr "ç?®å??ç??ä½¿ç?¨é??ç?ºï¼?{0} KBã??é?¤é??ä½ å?ªé?¤ä¸?äº?é?µä»¶ä¾?ç©ºå?ºé?¨å??ç©ºé??ï¼?å?¦å??å°?ç?¡æ³?å?³é??é?µä»¶ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "Your password has expired."
-msgstr "ä½ ç??å¯?ç¢¼å·²ç¶?å?°æ??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} ç?¡æ³?å? å?¥å?å??æ?§å?¶æ¸?å?®"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} å·²ç¶?æ?¯ä¸?å??ä»£ç??äººäº?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} å·²ç¶?å?¨æ¸?å?®ä¸"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??å·¥ä½?"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "æª¢æ?¥è³?æ??å¤¾æ¬?é??"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "é?»å?é?µä»¶è?ªé?¸æ¨?é "
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 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:120
+#: ../plugins/external-editor/external-editor.c:119
 msgid "Automatically launch when a new mail is edited"
 msgstr "ç?¶ç·¨è¼¯æ?°é?µä»¶æ??è?ªå??å?·è¡?"
 
@@ -16185,6 +16266,23 @@ msgstr "é ?è¨å¤?é?¨ç·¨è¼¯å?¨"
 msgid "The default command that must be used as the editor."
 msgstr "é ?è¨ç??æ??ä»¤å¿?é ?è?½å??ç?ºç·¨è¼¯å?¨ã??"
 
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "ç?¨ä¾?å??å??ç·¨è¼¯å?¨ç??æ??ä»¤: "
+
+#: ../plugins/external-editor/external-editor.c:109
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Emacs ä½¿ç?¨ã??xemacsã??\n"
+"VI ä½¿ç?¨ã??gvim -fã??"
+
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
+msgid "Compose in External Editor"
+msgstr "å?¨å¤?é?¨ç·¨è¼¯å?¨ä¸æ?°å¯«"
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "å¤?é?¨ç·¨è¼¯å?¨"
@@ -16202,7 +16300,9 @@ msgid "Editor not launchable"
 msgstr "ç·¨è¼¯å?¨ç?¡æ³?å??å??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
-msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
 msgstr "Evoluton ç?¡æ³?å»ºç«?ç?¨ä¾?å?²å?ä½ é?µä»¶ç??æ?«å?æª?æ¡?ã??è«?ç¨?å¾?å??è©¦ã??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
@@ -16210,80 +16310,91 @@ msgid "External editor still running"
 msgstr "å¤?é?¨ç·¨è¼¯å?¨ä»?å?¨å?·è¡?ä¸"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
 msgstr "å¤?é?¨ç·¨è¼¯å?¨ä»?å?¨å?·è¡?ä¸ã??å?ªè¦?è©²ç·¨è¼¯å?¨ä»?å?¨ä½¿ç?¨ï¼?é?µä»¶ç·¨è¼¯å?¨è¦?çª?å°±ä¸?è?½é??é??ã??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
 msgstr "ä¸?è?½å??å??å?¨ä½ å¤?æ??ç¨?å¼?å??å¥½è¨å®?ä¸è¨å®?ç??å¤?é?¨ç·¨è¼¯å?¨ã??è«?å??è©¦è¨å®?ä¸?å??ç??ç·¨è¼¯å?¨ã??"
 
-#: ../plugins/external-editor/external-editor.c:109
-msgid "Command to be executed to launch the editor: "
-msgstr "ç?¨ä¾?å??å??ç·¨è¼¯å?¨ç??æ??ä»¤: "
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr "é ?è¨æ??å?¥å¤§é ç?§"
 
-#: ../plugins/external-editor/external-editor.c:110
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
-msgstr ""
-"Emacs ä½¿ç?¨ã??xemacsã??\n"
-"VI ä½¿ç?¨ã??gvim -fã??"
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr "æ?¯å?¦é ?è¨å?¨å¤?å¯?é?µä»¶ä¸æ??å?¥å¤§é ç?§ã??å?¨æ ¸å??é??å??é?¸é ?ä¹?å??å¿?é ?å??è¨å®?å¥½ç?¸ç??ï¼?å?¦å??ä¸?æ??æ??ä»»ä½?æ??æ??ã??"
 
-#: ../plugins/external-editor/external-editor.c:354
-#: ../plugins/external-editor/external-editor.c:356
-msgid "Compose in External Editor"
-msgstr "å?¨å¤?é?¨ç·¨è¼¯å?¨ä¸æ?°å¯«"
+#: ../plugins/face/face.c:286
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+msgstr "é?¸æ??ä¸?å¼µ png ç?¸ç??ï¼?æ??å¥½å°?æ?¼ 700 ä½?å??çµ?ï¼?å°ºå¯¸ 48*48ï¼?"
 
-#: ../plugins/face/face.c:59
-msgid "Select a (48*48) png of size < 700bytes"
-msgstr "é?¸æ??å°?æ?¼ 700 ä½?å??çµ?ç?? (48*48) png"
+#: ../plugins/face/face.c:296
+msgid "Image files"
+msgstr "å??ç??æª?æ¡?"
 
-#: ../plugins/face/face.c:69
-msgid "PNG files"
-msgstr "PNG æª?æ¡?"
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr "é ?è¨æ??å?¥å¤§é ç?§(_I)"
 
-#: ../plugins/face/face.c:126
-msgid "_Face"
-msgstr "é?¢è²?(_F)"
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr "è¼?å?¥æ?°ç??å¤§é ç?§(_F)"
+
+#: ../plugins/face/face.c:415
+msgid "Include _Face"
+msgstr "å??å?«å¤§é ç?§(_F)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach a small picture of your face to outgoing messages.\n"
-"\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 encoded and stored in ~/.evolution/faces. This will be used in subsequent sent messages."
-msgstr ""
-"å?¨å¤?å¯?ç??é?µä»¶ä¸é??å? å¤§é è²¼ç?§ç??ã??\n"
-"\n"
-"ç¬¬ä¸?æ¬¡ä½¿ç?¨æ??é??è¦?å??è¨å®?ä¸?å¼µ 48x48 ç?? PNG å??ç??ã??å®?æ??ä»¥ Base-64 ç·¨ç¢¼ä¸¦å?²å?æ?¼ ~/.evolution/faces ã??é??æ??ç?¨å?¨æ?ªä¾?æ??å¯?å?ºç??é?µä»¶ä¸ã??"
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "å?¨å¤?å¯?é?µä»¶ä¸é??å¸¶æ??ä½ è??é?¨ç??å°?ç?§ç??ã??"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾ ã??%sã??"
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "ç?¡æ³?è®?å??"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Unsubscribe Folders"
-msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "Invalid Image Size"
+msgstr "ç?¡æ??ç??å??ç??å¤§å°?"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
-msgstr "è¦?å??æ¶?è¨?é?± IMAP è³?æ??å¤¾ï¼?å?¯å?¨è³?æ??å¤¾æ¨¹ä¸å°?å®?æ??æ»?é¼ å?³é?µã??"
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr "ä¸?æ?¯å??ç??æª?"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "å??æ¶?è¨?é?±(_U)"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "è«?é?¸æ??å°ºå¯¸ç?º 48*48 ç??å??ç??"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "ä¸?è?½è®?å??é??å??æª?æ¡?"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr "ä½ é?¸å??ç??æª?æ¡?ä¼¼ä¹?ä¸?æ?¯æ??æ??ç?? .png å??ç??ã??é?¯èª¤ï¼?{0}"
 
-#: ../plugins/google-account-setup/google-source.c:82
 #: ../plugins/google-account-setup/google-contacts-source.c:51
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:518
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+msgid "<b>Server</b>"
+msgstr "<b>ä¼ºæ??å?¨</b>"
+
+#: ../plugins/google-account-setup/google-source.c:517
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "è¼¸å?¥ä½¿ç?¨è?? %s ç??å¯?ç¢¼ä»¥å?å??å·²è¨?é?±ç??è¡?äº?æ??æ¸?å?®ã??"
 
-#: ../plugins/google-account-setup/google-source.c:624
+#: ../plugins/google-account-setup/google-source.c:623
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16292,19 +16403,20 @@ msgstr ""
 "ä¸?è?½å¾? Google ä¼ºæ??å?¨è®?å??è³?æ??ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:759
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:941
+msgid "Unknown error."
+msgstr "ä¸?æ??ç??é?¯èª¤ã??"
+
+#: ../plugins/google-account-setup/google-source.c:758
 msgid "Cal_endar:"
 msgstr "è¡?äº?æ??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:794
+#: ../plugins/google-account-setup/google-source.c:793
 msgid "Retrieve _list"
 msgstr "å??å??æ¸?å?®(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
-msgid "<b>Server</b>"
-msgstr "<b>ä¼ºæ??å?¨</b>"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
 msgstr "å°? Google æ?¥æ??å? å?¥ Evolutionã??"
@@ -16313,19 +16425,44 @@ msgstr "å°? Google æ?¥æ??å? å?¥ Evolutionã??"
 msgid "Google Calendars"
 msgstr "Google æ?¥æ??"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
 msgid "Checklist"
 msgstr "æª¢æ?¥æ¸?å?®"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Add Novell GroupWise support to Evolution."
-msgstr "å? å?¥ Evolution å°? Novell GroupWise ç??æ?¯æ?´ã??"
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "æ?°å¢?å??äº«è³?æ??å¤¾(_S)..."
+
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "ä»£ç??ä¼ºæ??å?¨ç?»å?¥(_P)..."
+
+#: ../plugins/groupwise-features/gw-ui.c:170
+msgid "Junk Mail Settings..."
+msgstr "å??å?¾é?µä»¶è¨å®?å?¼..."
+
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "è¿½è¹¤é?µä»¶ç??æ??..."
+
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "æ?¶å??é?µä»¶"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "GroupWare å¸³è??è¨å®?"
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "æ?«æ??å¥?ç?¨"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "é??å¯?æ??è°(_N)..."
+
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
+msgid "Create folder"
+msgstr "å»ºç«?è³?æ??å¤¾"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:225
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16336,7 +16473,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "ä½¿ç?¨è??ã??%sã??å??äº«äº?ä¸?å??è³?æ??å¤¾çµ¦ä½ \n"
@@ -16347,66 +16484,70 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"æ??ã??ç¹¼çº?ã??ä»¥å®?è£?å??äº«è³?æ??å¤¾\n"
+"æ??ã??å¥?ç?¨ã??ä»¥å®?è£?å??äº«è³?æ??å¤¾\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "å®?è£?å??äº«è³?æ??å¤¾"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:241
 msgid "Shared Folder Installation"
 msgstr "å??äº«è³?æ??å¤¾å®?è£?"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "å??å?¾é?µä»¶è¨å®?å?¼"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "å??å?¾é?µä»¶è¨å®?å?¼"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "å??å?¾é?µä»¶è¨å®?å?¼..."
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>å??å?¾é?µä»¶æ¸?å?®ï¼?</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "é?»å?é?µä»¶:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+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.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "å??ç?¨(_E)"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "å??å?¾é?µä»¶æ¸?å?®(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:52
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "ç§»é?¤(_R)"
+
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "é?µä»¶æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-retract.c:57
-msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this ?"
+#: ../plugins/groupwise-features/mail-retract.c:86
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this?"
 msgstr "æ?¶å??é?µä»¶å?¯è?½æ??å°?è©²é?µä»¶è?ªæ?¶ä»¶è??ç??ä¿¡ç®±ç§»é?¤ã??ä½ ç¢ºå®?è¦?é??éº¼å??ï¼?"
 
-#: ../plugins/groupwise-features/mail-retract.c:76
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "é?µä»¶å·²æ??å??æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retract Mail"
-msgstr "æ?¶å??é?µä»¶"
+#: ../plugins/groupwise-features/mail-send-options.c:200
+msgid "Insert Send options"
+msgstr "æ??å?¥å?³é??é?¸é ?"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
@@ -16443,7 +16584,9 @@ msgid "Invalid user"
 msgstr "ç?¡æ??ç??ä½¿ç?¨è??"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr "ä»¥ &quot;{0}&quot; ç?»å?¥ä»£ç??ä¼ºæ??å?¨å¤±æ??ã??è«?æª¢æ?¥ä½ ç??é?»å?é?µä»¶ä½?å??ä¸¦å??è©¦ä¸?æ¬¡ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
@@ -16475,16 +16618,16 @@ msgid "You have to specify a user name which you want to add to the list"
 msgstr "ä½ å¿?é ?æ??å®?è¦?å? å?¥æ¸?å?®ä½¿ç?¨è??å??ç¨±"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting ?"
+msgid "Do you want to resend the meeting?"
 msgstr "æ?¯å?¦è¦?é??æ?°å?³é??é??å??æ??è°ï¼?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting ?"
-msgstr "ç¢ºå®?è¦?é??æ?°å?³é??æ¤é?±æ??æ?§æ??è°ï¼?"
+msgid "Do you want to resend the recurring meeting?"
+msgstr "æ?¯å?¦è¦?é??æ?°å?³é??æ¤é?±æ??æ?§æ??è°ï¼?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item ?"
-msgstr "ç¢ºå®?è¦?æ?¶å??å??å§?ç??é ?ç?®ï¼?"
+msgid "Do you want to retract the original item?"
+msgstr "æ?¯å?¦è¦?æ?¶å??å??å§?ç??é ?ç?®ï¼?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
 msgid "The original will be removed from the recipient's mailbox."
@@ -16499,7 +16642,9 @@ msgid "This will create a new meeting using the existing meeting details."
 msgstr "é??æ??ä½¿ç?¨æ?¢å?ç??æ??è°è©³ç´°è³?æ??å»ºç«?æ?°ç??æ??è°ã??"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
 msgstr "é??æ??ä½¿ç?¨æ?¢å?ç??æ??è°è©³ç´°è³?æ??å»ºç«?æ?°ç??æ??è°ã??å?¶ä¸é?±æ??æ?§è¦?å??ç??é?¨å??é??è¦?é??æ?°è¼¸å?¥ã??"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
@@ -16512,221 +16657,191 @@ msgstr "ä½ æ?³è¦?æ?¥å??å®?å??ï¼?"
 msgid "Would you like to decline it?"
 msgstr "ä½ æ?³è¦?æ??çµ?å®?å??ï¼?"
 
-#: ../plugins/groupwise-features/process-meeting.c:53
-msgid "Accept Tentatively"
-msgstr "æ?«æ??å¥?ç?¨"
-
-#: ../plugins/groupwise-features/process-meeting.c:319
-msgid "Rese_nd Meeting..."
-msgstr "é??å¯?æ??è°(_N)..."
-
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>ä½¿ç?¨è??ï¼?</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "è?ªé?¸é??ç?¥è¨?æ?¯(_U)"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Con_tacts..."
 msgstr "è?¯çµ¡äºº(_T)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:514
-msgid "Message"
-msgstr "é?µä»¶"
-
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "å??äº«è³?æ??å¤¾é??ç?¥"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "å??è??è??å°?æ??æ?¶å?°ä¸?å??é??ç?¥ã??\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "æ?ªå??äº«(_N)"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "å??äº«çµ¦(_S)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "å??äº«(_S)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>å??ç¨±</b>"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "å?å??æ¬?å?©"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "å? å?¥/ç·¨è¼¯"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "è?¯çµ¡äºº(_T)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "ç·¨è¼¯è³?æ??å¤¾/é?¸é ?/è¦?å??/(_F)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "è®?å??æ¨?è¨?ç?ºç§?äººç??é ?ç?®(_P)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "æ??é??å?¨å??è¨»"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "è¨?é?±è?³æ??ç??é¬§é?´(_A)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "è¨?é?±è?³æ??ç??é??ç?¥(_N)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "å¯«å?¥(_W)"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "è®?(_R)"
 
-#. 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-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "ä»£ç??ä¼ºæ??å?¨"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>å¸³è??å??ç¨±</b>"
 
-#. 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-login-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "ç?»å?¥ä»£ç??ä¼ºæ??å?¨"
 
-#: ../plugins/groupwise-features/proxy-login.c:207
-#: ../plugins/groupwise-features/proxy-login.c:250
-#: ../plugins/groupwise-features/proxy.c:488
-#: ../plugins/groupwise-features/send-options.c:86
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy.c:495
+#: ../plugins/groupwise-features/send-options.c:85
 #, 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-login.c:512
-msgid "_Proxy Login..."
-msgstr "ä»£ç??ä¼ºæ??å?¨ç?»å?¥(_P)..."
-
 #. 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:689
+#: ../plugins/groupwise-features/proxy.c:692
 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:695
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ä»£ç??ä¼ºæ??å?¨é ?ç±¤å?ªæ??å?¨å??ç?¨æ¤å¸³è??æ??æ??æ??å?ºç?¾ã??"
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:701
+msgid "Add User"
+msgstr "å? å?¥ä½¿ç?¨è??"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "é?²é??å?³é??é?¸é ?"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "ä½¿ç?¨è??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "è¼¸å?¥ä½¿ç?¨è??ä¸¦è¨å®?æ¬?é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
-msgid "New _Shared Folder..."
-msgstr "æ?°å¢?å??äº«è³?æ??å¤¾(_S)..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "å??äº«"
 
-#: ../plugins/groupwise-features/share-folder.c:531
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "è?ªé?¸é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
 msgstr "æ?°å¢?"
 
-#: ../plugins/groupwise-features/share-folder.c:759
+#: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "ä¿®æ?¹"
 
-#: ../plugins/groupwise-features/status-track.c:94
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "é?µä»¶ç??æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:108
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "ä¸»æ?¨:"
 
-#: ../plugins/groupwise-features/status-track.c:122
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "å¯?ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "å»ºç«?æ?¥æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:176
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Recipient: "
 msgstr "æ?¶ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:183
+#: ../plugins/groupwise-features/status-track.c:211
 msgid "Delivered: "
 msgstr "å·²é??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Opened: "
 msgstr "å·²é??å??:"
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Accepted: "
 msgstr "å·²æ?¥å??:"
 
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Deleted: "
 msgstr "å·²å?ªé?¤:"
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Declined: "
 msgstr "å·²å©?æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Completed: "
 msgstr "å·²å®?æ??: "
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Undelivered: "
 msgstr "æ?ªé??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:238
-msgid "Track Message Status..."
-msgstr "è¿½è¹¤é?µä»¶ç??æ??..."
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "Add Hula support to Evolution."
 msgstr "å? å?¥ Evolution å°? Hula ç??æ?¯æ?´ã??"
@@ -16735,35 +16850,38 @@ msgstr "å? å?¥ Evolution å°? Hula ç??æ?¯æ?´ã??"
 msgid "Hula Support"
 msgstr "Hula æ?¯æ?´"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "è¡?å?§å??ç??"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "ç?´æ?¥å?¨é?µä»¶ä¸é¡¯ç¤ºå??ç??ã??"
+
+#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "è?ªé?¸æª?é "
 
-#: ../plugins/imap-features/imap-headers.c:345
+#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP æª?é "
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>è?ªé?¸æª?é </b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>IMAP æ¨?é </b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "å?ºæ?¬è??é??ä¿¡è«?å£?æª?é (é ?è¨å?¼)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
 "æ??ä¾?å?¨ä¸?å??æ¨?æº?æª?é ä»¥å¤?ä½ æ?³è¦?æ?¥æ?¶ç??é¡?å¤?æª?é ã??\n"
 "å¦?æ??ä½ é?¸æ??äº?ã??å®?æ?´æª?é ã??å??å?¯ä»¥å¿½ç?¥æ¤é ?ã??"
 
-#: ../plugins/imap-features/imap-headers.glade.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -16771,7 +16889,7 @@ msgstr ""
 "é?¸æ??æ?³è¦?ç?? IMAP æª?é å??å¥½è¨å®?ã??\n"
 "æ??å¤?æª?é æ??è?±æ??å¤?ç??æ??é??ä¸?è¼?å®?ã??"
 
-#: ../plugins/imap-features/imap-headers.glade.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -16779,7 +16897,7 @@ msgstr ""
 "å?ºæ?¬æª?é (_B) - (æ??å¿«)\n"
 "è?¥æ²?æ??é??ä¿¡è«?å£?é??æ¿¾å?¨å??å?¯ä½¿ç?¨æ¤é ?"
 
-#: ../plugins/imap-features/imap-headers.glade.h:10
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
 msgstr "æ?·å??æ??æ??é?µä»¶æª?é (_F)"
 
@@ -16791,658 +16909,667 @@ msgstr "æ ¡èª¿ä½ ç?? IMAP å¸³è??ã??"
 msgid "IMAP Features"
 msgstr "IMAP å??è?½"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "ç?¡æ³?è¼?å?¥ç¡¬ä»¶æ?½è±¡å±¤"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
-msgstr "ã??haldã??æ??å??æ?¯å¿?è¦?ç??ä½?ç?®å??ä¸¦æ?ªå?·è¡?ã??è«?å??ç?¨è©²æ??å??å¾?å??å??å?°æ?¬ç¨?å¼?ï¼?æ??è??è?¯çµ¡ä½ ç??ç³»çµ±ç®¡ç??è??ã??"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
-msgid "Search for an iPod failed"
-msgstr "æ??å°? iPod å¤±æ??"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid "Evolution could not find an iPod to synchronize with. Either the iPod is not connected to the system or it is not powered on."
-msgstr "Evolution ç?¡æ³?æ?¾å?°è¦?å??æ¥å??ç?? iPodã??å?¯è?½æ?¯ iPod å°?æ?ªé?£æ?¥å?°ç³»çµ±æ??è??æ²?æ??æ??é??é?»æº?ã??"
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar æ ¼å¼? (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize to iPod"
-msgstr "å??æ¥å?? iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize your data with your Apple iPod."
-msgstr "å°?ä½ ç??è³?æ??è?? Apple iPod å??æ¥å??ã??"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "iPod å??æ¥å??"
-
-#: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:494
+#: ../plugins/itip-formatter/itip-formatter.c:619
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "è¼?å?¥è¡?äº?æ??ã??%sã??å¤±æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:639
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "è¡?äº?æ?? '%s' ä¸ç??ç´?æ??å??é??å??æ??è°ç?¸è¡?çª?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:675
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "å°?æ?¾å?¨è¡?äº?æ??ã??%sã??ä¸ç??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:774
 msgid "Unable to find any calendars"
 msgstr "æ?¾ä¸?å?°ä»»ä½?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:781
 msgid "Unable to find this meeting in any calendar"
 msgstr "ç?¡æ³?å?¨ä»»ä½?è¡?äº?æ??ä¸æ?¾å?°é??å??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:785
 msgid "Unable to find this task in any task list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸æ?¾å?°é??é ?å·¥ä½?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸æ?¾å?°é??é ?å??å¿?é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:839
+#: ../plugins/itip-formatter/itip-formatter.c:860
 msgid "Opening the calendar. Please wait.."
 msgstr "æ£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:842
+#: ../plugins/itip-formatter/itip-formatter.c:863
 msgid "Searching for an existing version of this appointment"
 msgstr "å°?æ?¾é??å??ç´?æ??æ?¢å?ç??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1044
 msgid "Unable to parse item"
 msgstr "ç?¡æ³?å??æ??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1111
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ç?¡æ³?å?³é??é ?ç?®è?³è¡?äº?æ??ã??%sã??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1127
+#: ../plugins/itip-formatter/itip-formatter.c:1147
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºä¸?ç¢ºå®?ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²å©?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1137
+#: ../plugins/itip-formatter/itip-formatter.c:1157
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å?³é??è?³è¡?äº?æ??ã??%sã??ä¸¦è¨ç?ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æ??è°å?¬é??äººå·²ç§»é?¤ä»£ç??äºº %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1258
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ç?¡æ³?å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??ä½¿å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1400
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ç?¡æ³?æ?´æ?°å?°æ??è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1381
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Attendee status updated"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1430
 msgid "Meeting information sent"
 msgstr "æ??è°è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1433
 msgid "Task information sent"
 msgstr "å·¥ä½?è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1436
 msgid "Memo information sent"
 msgstr "å??å¿?é??è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ç?¡æ³?å¯?å?ºæ??è°è³?è¨?ï¼?è©²æ??è°ä¸¦ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Unable to send task information, the task does not exist"
 msgstr "ç?¡æ³?å¯?å?ºå·¥ä½?è³?è¨?ï¼?è©²é ?å·¥ä½?ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ç?¡æ³?å¯?å?ºå??å¿?é??è³?è¨?ï¼?è©²å??å¿?é??ä¸¦ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1496
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1516
+msgid "calendar.ics"
+msgstr "calendar.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1521
+msgid "Save Calendar"
+msgstr "å?²å?è¡?äº?æ??"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1574
+#: ../plugins/itip-formatter/itip-formatter.c:1585
 msgid "The calendar attached is not valid"
 msgstr "é??å¸¶ç??è¡?äº?æ??æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1508
-msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "æ¤é?µä»¶å®£å??å?¶å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?å?¶è¡?äº?æ??ä¸¦é??æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1548
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../plugins/itip-formatter/itip-formatter.c:1654
+#: ../plugins/itip-formatter/itip-formatter.c:1760
 msgid "The item in the calendar is not valid"
 msgstr "è¡?äº?æ??ä¸ç??é ?ç?®æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1549
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1669
-msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
+#: ../plugins/itip-formatter/itip-formatter.c:1627
+#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1761
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
 msgstr "æ¤é?µä»¶ç¢ºå¯¦å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?è©²å?§å®¹ä¸¦æ?ªå??å?«ä»»ä½?äº?ä»¶ã??å·¥ä½?æ??ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1589
-msgid "To process all of these items, the file should be saved and the calendar imported"
+#: ../plugins/itip-formatter/itip-formatter.c:1669
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??è©²å°?æ¤æª?æ¡?å?²å?å¾?å?¯å?¥å?¶ä¸ç??è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2434
 msgid "This meeting recurs"
 msgstr "é??å??æ??è°ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../plugins/itip-formatter/itip-formatter.c:2437
 msgid "This task recurs"
 msgstr "é??é ?å·¥ä½?ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2341
+#: ../plugins/itip-formatter/itip-formatter.c:2440
 msgid "This memo recurs"
 msgstr "é??å??å??å¿?é??ç??å¾ªç?°è¦?å??ç?º"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2574
+#: ../plugins/itip-formatter/itip-formatter.c:2669
 msgid "_Delete message after acting"
 msgstr "å®?æ??å¾?å?ªé?¤é?µä»¶(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2584
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2679
+#: ../plugins/itip-formatter/itip-formatter.c:2712
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 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:196
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M"
 msgstr "ä»?å¤© %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %H:%M:%S"
 msgstr "ä»?å¤© %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:213
 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:224
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M"
 msgstr "æ??å¤© %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:232
 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:233
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M %p"
 msgstr "æ??å¤©%p %-l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:241
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "æ??å¤©%p %-l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:260
 #, 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:261
+#: ../plugins/itip-formatter/itip-view.c:265
 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:265
+#: ../plugins/itip-formatter/itip-view.c:269
 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:270
+#: ../plugins/itip-formatter/itip-view.c:274
 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:274
+#: ../plugins/itip-formatter/itip-view.c:278
 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:283
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e"
 msgstr "%-m æ?? %d æ?¥ (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M"
 msgstr "%-m æ?? %d æ?¥ (%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m æ?? %d æ?¥ (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:330
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../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:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../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:358
+#: ../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:360
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?ä¸?å??æ??è°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> å·²ç¶?å§?æ´¾ä¸?å??æ??è°çµ¦ä½ ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../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 é??è«?ä½ å?ºå¸ä¸?å??æ??è°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> é??è«?ä½ å?ºå¸ä¸?å??æ??è°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??æ??è°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??æ??è°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
 msgstr "<b>%s</b> é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??è°ç??æ??æ?°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> å¸?æ??æ?¶å?°ä¸?å??æ??è°ç??æ??æ?°å·¥ä½?è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../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 å?³é??äº?ä¸?å??æ??è°ç??å??è¦?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> å?³é??äº?ä¸?å??æ??è°ç??å??è¦?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../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 å·²ç¶?æ¶?å??ä¸?å??æ??è°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> å·²ç¶?æ¶?å??ä¸?å??æ??è°ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../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 å·²ç¶?ç?è¦?äº?ä¸?å??æ??è°æ?´æ?¹ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> å·²ç¶?ç?è¦?äº?ä¸?å??æ??è°æ?´æ?¹ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../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 å·²ç¶?å©?æ??äº?ä¸?å??æ??è°æ?´æ?¹ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> å·²ç¶?å©?æ??äº?ä¸?å??æ??è°æ?´æ?¹ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> æ??æ´¾ %s å? å?¥ä¸?å??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:460
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?æ??æ´¾ä½ ä¸?é ?å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> å·²ç¶?æ??æ´¾ä½ ä¸?é ?å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?é ?æ?¢å?ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?é ?æ?¢å?ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
 msgstr "<b>%s</b> é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??æ´¾å·¥ä½?ç??æ??æ?°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
 msgstr "<b>%s</b> å¸?æ??æ?¶å?°ä¸?å??æ??æ´¾å·¥ä½?ç??æ??æ?°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> é??é?? %s å?³é??äº?ä¸?å??æ??æ´¾å·¥ä½?ç??å??è¦?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../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> å?³é??äº?ä¸?å??æ??æ´¾å·¥ä½?ç??å??è¦?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../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 å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> é??é?? %s å·²ç¶?å??è¦?ä¸?å??æ??æ´¾å·¥ä½?ç??æ?´æ?¹ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> å·²ç¶?å??è¦?ä¸?å??æ??æ´¾å·¥ä½?ç??æ?´æ?¹ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../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 å·²å©?æ??äº?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> å·²ç¶?å©?æ??ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?æ¶?å??ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> å·²ç¶?å??æ¶?ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
 
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr "æ?´å¤©ï¼?"
+
+#: ../plugins/itip-formatter/itip-view.c:686
+msgid "Start day:"
+msgstr "é??å§?æ?¥ï¼?"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1041
+msgid "Start time:"
+msgstr "é??å§?æ??é??:"
+
+#: ../plugins/itip-formatter/itip-view.c:698
+msgid "End day:"
+msgstr "çµ?æ??æ?¥ï¼?"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "End time:"
+msgstr "çµ?æ??æ??é??:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:823
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "é??å??è¡?äº?æ??(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../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:833
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "å?¨é?¨æ??çµ?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "å?¨é?¨æ?«è¨?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../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
 msgid "_Tentative"
 msgstr "æ?«è¨?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Accept all"
 msgstr "å?¨é?¨æ?¥å??(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Send Information"
 msgstr "å?³é??è³?è¨?(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "æ?´æ?°å?ºå¸ç??æ??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Start time:"
-msgstr "é??å§?æ??é??:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1044
-msgid "End time:"
-msgstr "çµ?æ??æ??é??:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1064
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:1126
 msgid "Comment:"
 msgstr "è¨»è§£:"
 
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Send _reply to sender"
 msgstr "å??è¦?å¯?ä»¶è??(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1141
 msgid "Send _updates to attendees"
 msgstr "å?³é??æ?´æ?°çµ¦å?°æ??è??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1142
+#: ../plugins/itip-formatter/itip-view.c:1150
 msgid "_Apply to all instances"
 msgstr "å¥?ç?¨è?³æ??æ??å¯¦é«?(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1151
+#: ../plugins/itip-formatter/itip-view.c:1159
 msgid "Show time as _free"
 msgstr "é¡¯ç¤ºæ??é??ç?ºç©ºé??(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Preserve my reminder"
 msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1160
+#: ../plugins/itip-formatter/itip-view.c:1168
 msgid "_Inherit reminder"
 msgstr "ç¹¼æ?¿æ??é??(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
+#: ../plugins/itip-formatter/itip-view.c:1911
+msgid "_Tasks:"
+msgstr "å·¥ä½?(_T):"
+
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "å??å¿?é??(_M):"
 
@@ -17455,7 +17582,9 @@ 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;?"
+msgid ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot;?"
 msgstr "ã??{0}ã??å·²ä»£ç??æ¤æ??è°ã??æ?¯å?¦é??è¦?å? å?¥ä»£ç??äººã??{1}ã??ï¼?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -17463,21 +17592,10 @@ msgid "This meeting has been delegated"
 msgstr "é??å??æ??è°å·²å§?æ´¾"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "é??å??å??è¦?ä¸¦é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?å¯?ä»¶äººå? å?¥ç?ºå?°æ??è??ï¼?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-msgid "Proxy _Logout"
-msgstr "ç?»å?ºä»£ç??ä¼ºæ??å?¨(_L)"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Disable Account"
-msgstr "å??ç?¨å¸³è??"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable an account by right-clicking on it in the folder tree."
-msgstr "è¦?å??ç?¨å¸³è??ï¼?å?¯å?¨è³?æ??å¤¾æ¨¹ä¸å°?å®?æ??æ»?é¼ å?³é?µã??"
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "ç?¼å?ºå?¶è?²æ??æ?æ?¾è?²é?³æª?æ¡?ã??"
@@ -17499,7 +17617,9 @@ 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
-msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??ç?¶æ?°é?µä»¶æ?µé??æ??ç?¼å?ºå?¶è?²å?¦å??å°±æ?æ?¾è?²é?³æª?ã??"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -17511,51 +17631,55 @@ msgid "Play sound when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?æ?¾è?²é?³æª?æ¡?ã??"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+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
 msgid "Popup message together with the icon."
 msgstr "å?¨å??ç¤ºä¸?å½?å?ºæ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??å?¨é??ç?¥å??é¡¯ç¤ºæ?°é?µä»¶å??ç¤ºã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "è¦?æ?æ?¾ç??è?²é?³æª?æ¡?å??ç¨±ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "æ?°é?µä»¶é??å?°æ??è¦?æ?æ?¾ç??é?³æ??æª?æ¡?ï¼?å¦?æ??ä¸?æ?¯ä½¿ç?¨å?¶è?²æ¨¡å¼?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Use sound theme"
+msgstr "ä½¿ç?¨é?³æ??ä¸»é¡?"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?¯å?¦æ?æ?¾è?²é?³æª?æ¡?æ??ç?¼å?ºå?¶è?²ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "æ?¯å?¦å?¨æ?°é?µä»¶æ?µé??æ??æ?¼å??ç¤ºä¸?å½?å?ºè¨?æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../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:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:245
-msgid "Generate a _D-Bus message"
-msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
-
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
 msgstr "Evolution ç??æ?°é?µä»¶é??ç?¥"
 
-#: ../plugins/mail-notification/mail-notification.c:389
+#: ../plugins/mail-notification/mail-notification.c:366
 msgid "Mail Notification Properties"
 msgstr "æ?°é?µä»¶é??ç?¥å±¬æ?§"
 
-#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:498
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:495
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17570,58 +17694,70 @@ msgstr[1] ""
 "ä½ å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? \n"
 "ä½?æ?¼ %sã??"
 
-#: ../plugins/mail-notification/mail-notification.c:503
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:506
+#, 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
+#, c-format
+msgid "Subject: %s"
+msgstr "ä¸»æ?¨ï¼?%s"
+
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ä½ å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 msgstr[1] "ä½ å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 
-#: ../plugins/mail-notification/mail-notification.c:520
-#: ../plugins/mail-notification/mail-notification.c:525
+#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:550
 msgid "New email"
 msgstr "æ?°é?µä»¶"
 
-#: ../plugins/mail-notification/mail-notification.c:588
+#: ../plugins/mail-notification/mail-notification.c:604
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å??ä¸é¡¯ç¤ºå??ç¤º(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:632
 msgid "B_link icon in notification area"
 msgstr "è®?é??ç?¥å??å??ç¤ºé??ç??(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:593
+#: ../plugins/mail-notification/mail-notification.c:642
 msgid "Popup _message together with the icon"
 msgstr "å?¨å??ç¤ºä¸?å½?å?ºè¨?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:827
 msgid "_Play sound when new messages arrive"
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?æ?¾è?²é?³æª?æ¡?(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:780
+#: ../plugins/mail-notification/mail-notification.c:856
 msgid "_Beep"
 msgstr "å?¶è?²(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:781
-msgid "Play _sound file"
-msgstr "æ?æ?¾è?²é?³æª?æ¡?(_S)"
+#: ../plugins/mail-notification/mail-notification.c:869
+msgid "Use sound _theme"
+msgstr "ä½¿ç?¨é?³æ??ä¸»é¡?(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:792
-msgid "Specify _filename:"
-msgstr "æ??å®?æª?æ¡?å??ç¨±(_F):"
+#: ../plugins/mail-notification/mail-notification.c:888
+msgid "Play _file:"
+msgstr "æ?æ?¾æª?æ¡?(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:793
+#: ../plugins/mail-notification/mail-notification.c:899
 msgid "Select sound file"
 msgstr "é?¸æ??è?²é?³æª?æ¡?"
 
-#: ../plugins/mail-notification/mail-notification.c:794
-msgid "Pl_ay"
-msgstr "æ?æ?¾(_A)"
-
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:957
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶(_I)"
 
+#: ../plugins/mail-notification/mail-notification.c:966
+msgid "Generate a _D-Bus message"
+msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
+
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "é?µä»¶é??ç?¥"
@@ -17630,176 +17766,229 @@ msgstr "é?µä»¶é??ç?¥"
 msgid "Notifies you when new mail messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??é??ç?¥ä½ ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:376
+#. 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
 #, c-format
-msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
+msgid "Created from a mail by %s"
+msgstr "å¾? %s ç??é?µä»¶æ??å»ºç«?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:496
+#, c-format
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«äº?ä»¶ã??%sã??ã??æ?¯å?¦è¦?ç·¨è¼¯æ¤è??ç??äº?ä»¶ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:379
+#: ../plugins/mail-to-task/mail-to-task.c:499
 #, c-format
-msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
 msgstr "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«å·¥ä½?ã??%sã??ã??æ?¯å?¦è¦?ç·¨è¼¯æ¤è??ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:382
+#: ../plugins/mail-to-task/mail-to-task.c:502
 #, c-format
-msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
 msgstr "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«å??å¿?é??ã??%sã??ã??æ?¯å?¦è¦?ç·¨è¼¯æ¤è??ç??å??å¿?é??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:399
-msgid "Selected calendar contains some events for the given mails already. Would you like to create new events anyway?"
+#: ../plugins/mail-to-task/mail-to-task.c:519
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
 msgstr "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸ç??äº?ä»¶ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?ä»¶ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:402
-msgid "Selected task list contains some tasks for the given mails already. Would you like to create new tasks anyway?"
+#: ../plugins/mail-to-task/mail-to-task.c:522
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
 msgstr "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:405
-msgid "Selected memo list contains some memos for the given mails already. Would you like to create new memos anyway?"
+#: ../plugins/mail-to-task/mail-to-task.c:525
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
 msgstr "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:423
-msgid "Selected calendar contains an event for the given mail already. Would you like to create new event anyway?"
-msgid_plural "Selected calendar contains events for the given mails already. Would you like to create new events anyway?"
+#: ../plugins/mail-to-task/mail-to-task.c:543
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
 msgstr[0] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??äº?ä»¶ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?ä»¶ï¼?"
 msgstr[1] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??äº?ä»¶ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?ä»¶ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:429
-msgid "Selected task list contains a task for the given mail already. Would you like to create new task anyway?"
-msgid_plural "Selected task list contains tasks for the given mails already. Would you like to create new tasks anyway?"
+#: ../plugins/mail-to-task/mail-to-task.c:549
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
 msgstr[0] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 msgstr[1] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:435
-msgid "Selected memo list contains a memo for the given mail already. Would you like to create new memo anyway?"
-msgid_plural "Selected memo list contains memos for the given mails already. Would you like to create new memos anyway?"
+#: ../plugins/mail-to-task/mail-to-task.c:555
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
 msgstr[0] "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 msgstr[1] "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:494
+#: ../plugins/mail-to-task/mail-to-task.c:614
 msgid "[No Summary]"
 msgstr "[æ²?æ??æ??è¦?]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:505
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "Invalid object returned from a server"
 msgstr "å¾?ä¼ºæ??å?¨å?³å??ç?¡æ??ç??ç?©ä»¶"
 
-#: ../plugins/mail-to-task/mail-to-task.c:570
+#: ../plugins/mail-to-task/mail-to-task.c:696
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "å?¨è??ç??æ??é??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ç?¡æ³?é??å??è¡?äº?æ??ã??%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
-msgid "Selected source is read only, thus cannot create event there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:732
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
 msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ¤ä¸?è?½å?¨é??è£?å»ºç«?äº?ä»¶ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
-msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:735
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
 msgstr "é?¸å®?ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ¤ä¸?è?½å?¨é??è£?å»ºç«?å·¥ä½?ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:612
-msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:738
+msgid ""
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ¤ä¸?è?½å?¨é??è£?å»ºç«?å??å¿?é??ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:941
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ä¸?è?½å??å¾?ä¾?æº?æ¸?å?®ã??%s"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "Convert a mail message to a task."
-msgstr "å°?é?µä»¶è½?æ??ç?ºå·¥ä½?ã??"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Create a Mem_o"
-msgstr "å»ºç«?å??å¿?é??(_O)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Create a _Meeting"
-msgstr "å»ºç«?æ??è°(_M)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
-msgid "Create a _Task"
-msgstr "å»ºç«?å·¥ä½?(_T)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create an _Event"
 msgstr "å»ºç«?äº?ä»¶(_E)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
-msgid "Mail-to-Task"
-msgstr "é?µä»¶è½?å·¥ä½?"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new event from the selected message"
 msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??äº?ä»¶"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
-msgid "Create a new meeting from the selected message"
-msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è°"
+#: ../plugins/mail-to-task/mail-to-task.c:1067
+msgid "Create a Mem_o"
+msgstr "å»ºç«?å??å¿?é??(_O)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new memo from the selected message"
 msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å??å¿?é??"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#: ../plugins/mail-to-task/mail-to-task.c:1074
+msgid "Create a _Task"
+msgstr "å»ºç«?å·¥ä½?(_T)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new task from the selected message"
 msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å·¥ä½?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "è?¯çµ¡äººæ¸?å?®æ??æ??è??(_O)"
+#: ../plugins/mail-to-task/mail-to-task.c:1084
+msgid "Create a _Meeting"
+msgstr "å»ºç«?æ??è°(_M)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
+#: ../plugins/mail-to-task/mail-to-task.c:1086
+msgid "Create a new meeting from the selected message"
+msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è°"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "å°?é?µä»¶è½?æ??ç?ºå·¥ä½?ã??"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+msgid "Get List _Archive"
 msgstr "å??å¾?æ¸?å?®æª?æ¡?åº«(_A)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+msgid "Get an archive of the list this message belongs to"
+msgstr "å??å¾?æ¤é?µä»¶æ??å±¬è«?å£?ç??æª?æ¡?åº«"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+msgid "Get List _Usage Information"
 msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "é??ä¿¡è«?å£?å??ä½?"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "å??å¾?æ¤é?µä»¶æ??å±¬è«?å£?ç??ä½¿ç?¨æ?¹æ³?ç?¸é??è³?è¨?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "é??ä¿¡è«?å£?(_L)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+msgid "Contact List _Owner"
+msgstr "è?¯çµ¡äººæ¸?å?®æ??æ??è??(_O)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr "å?·è¡?ä¸?è?¬é??ä¿¡è«?å£?æ??ä»¤ç??å??ä½? ï¼?è¨?é?±ã??å??æ¶?è¨?é?±ç?ç?â?¦ï¼?ã??"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "è?¯çµ¡æ¤é?µä»¶æ??å±¬é??ä¿¡è«?å£?ç??ç®¡ç??è??"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+msgid "_Post Message to List"
 msgstr "å?³é??é?µä»¶çµ¦è«?å£?(_P)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "æ?°å¯«é?µä»¶çµ¦æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+msgid "_Subscribe to List"
 msgstr "è¨?é?±è«?å£?(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "è¨?é?±æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+msgid "_Unsubscribe from List"
 msgstr "å??æ¶?è¨?é?±è«?å£?(_U)"
 
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "å??æ¶?è¨?é?±æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+msgid "Mailing _List"
+msgstr "é??ä¿¡è«?å£?(_L)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "é??ä¿¡è«?å£?å??ä½?"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "å?·è¡?ä¸?è?¬é??ä¿¡è«?å£?æ??ä»¤ç??å??ä½? ï¼?è¨?é?±ã??å??æ¶?è¨?é?±ç?ç?â?¦ï¼?ã??"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "ç?¡æ³?ä½¿ç?¨å??ä½?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
 "å?³å°?å¯?å?ºä¸?å°?é?»å?é?µä»¶è?³ URL \"{0}\"ã??ä½ å?¯ä»¥è?ªå??é??å?ºé?µä»¶ï¼?æ??æ?¯å??æ?¥ç??ä¸¦å??äº?æ?¹è®?ã??\n"
 "\n"
@@ -17818,7 +18007,9 @@ msgid "Posting not allowed"
 msgstr "ä¸?å??è¨±å¼µè²¼"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
 msgstr "å°?æ¤é??ä¿¡è«?å£?ç??å¼µè²¼æ?¯ä¸?è¢«å??è¨±ç??ã??é??å?¯è?½æ?¯ä¸?å??å?¯è®?ç??é??ä¿¡è«?å£?ã??è«?è?¯çµ¡è«?å£?ç??ç®¡ç??è??ä»¥å??å¾?é?²ä¸?æ¥è³?è¨?ã??"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
@@ -17827,7 +18018,8 @@ msgstr "å?³é??é?µä»¶å?°é??ä¿¡è«?å£?ï¼?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17846,7 +18038,9 @@ msgstr ""
 "æª?é ï¼? {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid "This message does not contain the header information required for this action."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "é??å°?é?µä»¶æ²?æ??å??å?«æ¤å??ä½?æ??é??ç??æª?é è³?è¨?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -17857,129 +18051,70 @@ msgstr "ç·¨è¼¯é?µä»¶(_E)"
 msgid "_Send message"
 msgstr "å?³é??é?µä»¶(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "è?¯çµ¡äººæ¸?å?®æ??æ??è??(_O)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "è?¯çµ¡æ¤é?µä»¶æ??å±¬é??ä¿¡è«?å£?ç??ç®¡ç??è??"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "å??å¾?æ¸?å?®æª?æ¡?åº«(_A)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get an archive of the list this message belongs to"
-msgstr "å??å¾?æ¤é?µä»¶æ??å±¬è«?å£?ç??æª?æ¡?åº«"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-msgid "Get information about the usage of the list this message belongs to"
-msgstr "å??å¾?æ¤é?µä»¶æ??å±¬è«?å£?ç??ä½¿ç?¨æ?¹æ³?ç?¸é??è³?è¨?"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "æ?°å¯«é?µä»¶çµ¦æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "è¨?é?±æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "å??æ¶?è¨?é?±æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "å?³é??é?µä»¶çµ¦è«?å£?(_P)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "è¨?é?±è«?å£?(_S)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "å??æ¶?è¨?é?±è«?å£?(_U)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "æ?¯å?¦ä¹?æ¨?è¨?å?è³?æ??å¤¾ä¸ç??é?µä»¶ï¼?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
-msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
+#: ../plugins/mark-all-read/mark-all-read.c:44
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
 msgstr "ä½ è¦?å°?ç?®å??ç??è³?æ??å¤¾ä¸ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µä»¶ã??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:166
+#: ../plugins/mark-all-read/mark-all-read.c:171
 msgid "In Current Folder and _Subfolders"
 msgstr "æ?¼ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:180
+#: ../plugins/mark-all-read/mark-all-read.c:185
 msgid "In Current _Folder Only"
 msgstr "æ?¼ç?®å??ç??è³?æ??å¤¾(_F)"
 
+#: ../plugins/mark-all-read/mark-all-read.c:342
+msgid "Mark Me_ssages as Read"
+msgstr "æ¨?ç¤ºé?µä»¶ç?ºå·²è®?(_S)"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "å?¨é?¨æ¨?ç¤ºæ??å·²è®?"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "æ¨?ç¤ºé?µä»¶ç?ºå·²è®?(_S)"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Mark all messages in a folder as read."
 msgstr "å°?è³?æ??å¤¾ä¸å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ã??"
 
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "Mono Loader"
-msgstr "Mono è¼?å?¥å?¨"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Support plugins written in Mono."
-msgstr "æ?¯æ?´ä»¥ Mono ç·¨å¯«ç??å¤?æ??ç¨?å¼?ã??"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "Manage your Evolution plugins."
 msgstr "ç®¡ç??ä½ ç?? Evolution å¤?æ??ç¨?å¼?ã??"
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
 msgstr "å¤?æ??ç¨?å¼?ç®¡ç??å?¡"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
-msgid "Enable and disable plugins"
-msgstr "å??ç?¨è??å??ç?¨å¤?æ??ç¨?å¼?"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "_Plugins"
-msgstr "å¤?æ??ç¨?å¼?(_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "ä½?è??"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "çµ?æ??"
-
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "æ³¨æ??ï¼?æ??äº?æ?´æ?¹å?¨é??æ?°å??å??å¾?æ??æ??ç??æ??"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "æ¦?è¦½"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
 msgstr "å¤?æ??ç¨?å¼?"
 
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "å¤?æ??ç¨?å¼?(_P)"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "å??ç?¨è??å??ç?¨å¤?æ??ç¨?å¼?"
+
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -17993,19 +18128,39 @@ msgstr "å??å¥½ç´?æ??å?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ä»¥ç´?æ??å?æ?¹å¼?æª¢è¦?é?µä»¶ï¼?å?³ä½¿å®?å??å?«æ?? HTML å?§å®¹ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??é¡¯ç¤ºä¹?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "å??å¥½ç´?æ??å?"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr "è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?é¡¯ç¤ºã??"
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid "Show plain text if present"
+msgstr "å¦?æ??ä¾?ç´?æ??å?å??é¡¯ç¤ºå®?"
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr "å¦?æ??æ??ç´?æ??å?ç??é?¨å??å°±é¡¯ç¤ºå®?ï¼?å?¦å??è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?é¡¯ç¤ºã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid "Only ever show plain text"
 msgstr "å?ªä»¥ç´?æ??å?é¡¯ç¤º"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr "å¦?æ??æ??è¦?æ±?æ??ï¼?æ°¸é? é¡¯ç¤ºç´?æ??å?ç??é?¨å??ä¸¦å¾?å?¶ä»?ç??é?¨å??è£½ä½?é??ä»¶ã??"
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "å°?æ??å?¶ç?? HTML é?¨å??é¡¯ç¤ºç?ºé??ä»¶(_U)"
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "HT_ML æ¨¡å¼?"
 
@@ -18029,26 +18184,37 @@ msgstr "Outlook PST å?¯å?¥"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook å??äººè³?æ??å¤¾ (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:299
+msgid "_Mail"
+msgstr "é?µä»¶(_M)"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:315
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "_Address Book"
 msgstr "é??è¨?é??(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:322
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "A_ppointments"
 msgstr "ç´?æ??(_P)"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "å·¥ä½?(_T)"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:334
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "_Journal entries"
 msgstr "æ?¥èª?é ?ç?®(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:349
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "Importing Outlook data"
 msgstr "å?¯å?¥ Outlook è³?æ??"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "è¡?äº?æ??ç?¼ä½?"
 
@@ -18060,141 +18226,139 @@ msgstr "ä½?ç½®"
 msgid "Publish calendars to the web."
 msgstr "å°?è¡?äº?æ??ç?¼ä½?ç?ºç¶²é ?ã??"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "ç?¼ä½?è¡?äº?æ??è³?è¨?(_P)"
-
-#: ../plugins/publish-calendar/publish-calendar.c:95
-#: ../plugins/publish-calendar/publish-calendar.c:337
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
 #, c-format
 msgid "Could not open %s:"
 msgstr "ç?¡æ³?é??å?? %sï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:97
+#: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "ç?¡æ³?é??å?? %sï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../plugins/publish-calendar/publish-calendar.c:117
+#: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "ç?¼ä½?å?° %s æ??ç?¼ç??é?¯èª¤ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:119
+#: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "ç?¼ä½?å?° %s å·²æ??å??çµ?æ??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:164
+#: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "æ??è¼? %s å¤±æ??ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:624
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "å??ç?¨(_E)"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "ç¢ºå®?è¦?ç§»é?¤é??å??ä½?ç½®ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:788
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
 msgid "Could not create publish thread."
 msgstr "ç?¡æ³?å»ºç«?ç?¼ä½?å?·è¡?ç·?ã??"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">ä½?ç½®</span>"
+#: ../plugins/publish-calendar/publish-calendar.c:1059
+msgid "_Publish Calendar Information"
+msgstr "ç?¼ä½?è¡?äº?æ??è³?è¨?(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">ä¾?æº?</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "è?ªé?¸ä½?ç½®"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
-msgstr ""
-"æ¯?æ?¥\n"
-"æ¯?é?±\n"
-"æ??å??(é??é??ã??å??ä½?ã??é?¸å?®)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "æ¯?å¤©"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "å??ç?¨(_E)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (é??ç?»å?¥)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr "æ??å?? (é??é??ã??å??ä½?ã??é?¸å?®)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "é?£æ?¥å? (_O):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "å?¬å?± FTP"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "ç?¼ä½?ä½?ç½®"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "ç?¼ä½?é »ç??(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"SSH\n"
-"å?¬ç?¨ FTP\n"
-"FTP (é??è¦?ç?»å?¥)\n"
-"Windows å?±ç?¨\n"
-"WebDAV (HTTP)\n"
-"å®?å?¨ç?? WebDAV (HTTPS)\n"
-"è?ªé?¸ä½?ç½®"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "å®?å?¨å¼? FTP (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "å®?å?¨å¼? WebDAV (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "æ??å??é¡?å??(_T):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "ä¾?æº?"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "æ??é??é?±æ??(_D):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "æ¯?é?±"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "Windows å??äº«"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "æª?æ¡?(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "å¯?ç¢¼(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "ç?¼ä½?ç?º(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "è¨?ä½?å¯?ç¢¼(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_U):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
-msgid ""
-"days\n"
-"weeks\n"
-"months"
-msgstr ""
-"æ?¥\n"
-"é?±\n"
-"æ??"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:32
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"iCal\n"
-"ç©ºé??/å¿?ç¢?"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
@@ -18202,38 +18366,14 @@ msgstr ""
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ç?¡æ³?ç?¼ä½?è¡?äº?æ??ï¼?è¡?äº?æ??å¾?ç«¯ç¨?å¼?å·²ä¸?å?å?¨"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:474
 msgid "New Location"
 msgstr "æ?°ç??ä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "Edit Location"
 msgstr "ç·¨è¼¯ä½?ç½®"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hello Python"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "Python å¤?æ??ç¨?å¼?è¼?å?¥ç¨?å¼?æ¸¬è©¦"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python æ¸¬è©¦å¤?æ??ç¨?å¼?"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Python EPlugin è¼?å?¥ç¨?å¼?ç??æ¸¬è©¦å¤?æ??ç¨?å¼?ã??"
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "å?¯ä»¥è¼?å?¥å?¶ä»?ä»¥ Python å¯«ç??å??è?½ç??å¤?æ??ç¨?å¼?ã??"
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "Python è¼?å?¥å?¨"
-
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
@@ -18265,16 +18405,16 @@ msgstr "ç?å¾? SpamAssassin å?ç¨?åº?ä¸æ?·ï¼?çµ?çµ?å®?..."
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "å°?ç®¡è?³ SpamAssassin å¤±æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
 #, c-format
-msgid "SpamAssassin is not available."
-msgstr "SpamAssassin ç?¡æ³?ä½¿ç?¨ã??"
+msgid "SpamAssassin is not available. Please install it first."
+msgstr "SpamAssassin ç?¡æ³?ä½¿ç?¨ã??è«?å??å®?è£?å®?ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "é??æ??è®? SpamAssasin æ?´å?¯é? ï¼?ä½?é??åº¦è®?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "I_nclude remote tests"
 msgstr "å??å?«é? ç«¯æ¸¬è©¦(_N)"
 
@@ -18294,78 +18434,82 @@ msgstr "SpamAssassin é?¸é ?"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../plugins/save-calendar/csv-format.c:157
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:353
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:355
 msgid "Description List"
 msgstr "æ??è¿°æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "Categories List"
 msgstr "å??é¡?æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Comment List"
 msgstr "è¨»è§£æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Contact List"
 msgstr "è?¯çµ¡äººæ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "Start"
 msgstr "é??å§?"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "End"
 msgstr "çµ?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "percent Done"
 msgstr "ï¼?å·²å®?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "URL"
 msgstr "ç¶²å??"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Attendees List"
 msgstr "å?°æ??è??æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Modified"
 msgstr "å·²ä¿®æ?¹"
 
-#: ../plugins/save-calendar/csv-format.c:523
+#: ../plugins/save-calendar/csv-format.c:520
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV æ ¼å¼?ç??é?²é??é?¸é ?(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:527
 msgid "Prepend a _header"
 msgstr "é ?å??è¦?ç?«æª?é (_H)"
 
-#: ../plugins/save-calendar/csv-format.c:539
+#: ../plugins/save-calendar/csv-format.c:536
 msgid "_Value delimiter:"
 msgstr "æ?¸å?¼å®?ç??ç¬¦(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:543
 msgid "_Record delimiter:"
 msgstr "ç´?é??å®?ç??ç¬¦(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:550
 msgid "_Encapsulate values with:"
 msgstr "ä»¥æ¤å°?è£?æ?¸å?¼(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:575
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "é??è??é??é??ç??æ?¸å?¼æ ¼å¼? (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar æ ¼å¼? (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "å?²å?é?¸å??ç??"
@@ -18374,50 +18518,38 @@ msgstr "å?²å?é?¸å??ç??"
 msgid "Save a calendar or task list to disk."
 msgstr "å°?è¡?äº?æ??æ??å·¥ä½?å?²å?è?³ç£?ç¢?ã??"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "å?²å?è?³ç£?ç¢?(_S)"
-
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:372
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "RDF æ ¼å¼? (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:104
+#: ../plugins/save-calendar/save-calendar.c:111
 msgid "_Format:"
 msgstr "æ ¼å¼?(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:172
 msgid "Select destination file"
 msgstr "é?¸å??ç?®ç??æª?æ¡?"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Quickly select a single calendar or task list for viewing."
-msgstr "å¿«é??é?¸å??è¦?æª¢è¦?ç??å?®ä¸?è¡?äº?æ??æ??å·¥ä½?æ¸?å?®ã??"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Select One Source"
-msgstr "é?¸æ??ä¸?å??ä¾?æº?"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "å?ªé¡¯ç¤ºé??å??è¡?äº?æ??(_O)"
+#: ../plugins/save-calendar/save-calendar.c:325
+msgid "Save the selected calendar to disk"
+msgstr "å°?é?¸å??ç??è¡?äº?æ??å?²å?è?³ç£?ç¢?"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "å?ªé¡¯ç¤ºæ¤å??å¿?é??æ¸?å?®(_O)"
+#: ../plugins/save-calendar/save-calendar.c:356
+msgid "Save the selected memo list to disk"
+msgstr "å°?é?¸å??ç??å??å¿?é??æ¸?å?®å?²å?è?³ç£?ç¢?"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "å?ªé¡¯ç¤ºæ¤å·¥ä½?æ¸?å?®(_O)"
+#: ../plugins/save-calendar/save-calendar.c:387
+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."
@@ -18427,17 +18559,18 @@ msgstr "æ??å¼?ä½ å®?æ??å??å§?å¸³è??è¨å®?ã??"
 msgid "Setup Assistant"
 msgstr "è¨å®?å?©ç??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Evolution Setup Assistant"
 msgstr "Evolution è¨å®?å?©ç??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:92
 msgid "Welcome"
 msgstr "æ¡è¿?ä½¿ç?¨"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:97
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
@@ -18446,29 +18579,26 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??æ??é??ç¹¼çº?ã?? "
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Importing files"
-msgstr "å?¯å?¥æª?æ¡?"
-
-#: ../plugins/startup-wizard/startup-wizard.c:117
-#: ../shell/e-shell-importer.c:138
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../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:132
-#: ../shell/e-shell-importer.c:419
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "ä¾?è?ª %sï¼?"
 
-#: ../plugins/startup-wizard/startup-wizard.c:203
-#: ../shell/e-shell-importer.c:548
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:167
+msgid "Importing files"
+msgstr "å?¯å?¥æª?æ¡?"
+
+#: ../plugins/startup-wizard/startup-wizard.c:230
 msgid "Importing data."
 msgstr "å?¯å?¥è³?æ??ã??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:205
-#: ../shell/e-shell-importer.c:562
+#: ../plugins/startup-wizard/startup-wizard.c:232
 msgid "Please wait"
 msgstr "è«?ç¨?å??"
 
@@ -18490,25 +18620,27 @@ msgid "F_all back to threading messages by subject"
 msgstr "é??å??å?°æ ¹æ??ä¸»æ?¨ç??ç?¸é??é?µä»¶(_A)"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
 msgstr "ä½¿ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå?/æ?¸å?¼çµ?æ¸?å?®ã??"
 
-#: ../plugins/templates/templates.c:601
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "å?ºæ?¼è??ç¨¿ç??ç¯?æ?¬å¤?æ??ç¨?å¼?"
+
+#: ../plugins/templates/templates.c:617
+msgid "No Title"
 msgstr "æ²?æ??æ¨?é¡?"
 
-#: ../plugins/templates/templates.c:709
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "å?²å?ç?ºç¯?æ?¬(_T)"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "å?²å?ç?ºç¯?æ?¬"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "å?ºæ?¼è??ç¨¿ç??ç¯?æ?¬å¤?æ??ç¨?å¼?"
-
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 msgstr "è§£ç¢¼ Microsoft Outlook ç?? TNEF (winmail.dat) é??ä»¶ã??"
@@ -18525,27 +18657,27 @@ msgstr "è¡?å?§ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸é¡¯ç¤º vCardã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:159
-#: ../plugins/vcard-inline/vcard-inline.c:243
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "Show Full vCard"
 msgstr "é¡¯ç¤ºå®?æ?´ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:162
+#: ../plugins/vcard-inline/vcard-inline.c:163
 msgid "Show Compact vCard"
 msgstr "é¡¯ç¤ºç²¾ç°¡ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:222
+#: ../plugins/vcard-inline/vcard-inline.c:224
 msgid "There is one other contact."
 msgstr "é??æ??è?¯çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:231
+#: ../plugins/vcard-inline/vcard-inline.c:233
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "é??æ?? %d å??å?¶ä»?è?¯çµ¡äººã??"
 msgstr[1] "é??æ?? %d å??å?¶ä»?è?¯çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:252
+#: ../plugins/vcard-inline/vcard-inline.c:254
 msgid "Save in Address Book"
 msgstr "å?å?¥é??è¨?é??"
 
@@ -18569,22 +18701,6 @@ msgstr "ç¶²å??:"
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfM_atch (é??ä½¿ç?¨ Apache < 2.2.8)"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Evolution Shell è¨å®?å·¥å» "
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution æ¸¬è©¦"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution æ¸¬è©¦å??ä»¶"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "é©?è?ä»£ç??ä¼ºæ??å?¨é?£ç·?"
@@ -18602,317 +18718,416 @@ msgid "Default sidebar width"
 msgstr "é ?è¨è³?è¨?æ?¹å¡?å??é??åº¦"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Default window X coordinate"
+msgstr "é ?è¨è¦?çª? X å??æ¨?"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window Y coordinate"
+msgstr "é ?è¨è¦?çª? Y å??æ¨?"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "é ?è¨è¦?çª?é«?åº¦"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "é ?è¨è¦?çª?ç??æ??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "é ?è¨è¦?çª?é??åº¦"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "ç?¶å?å??äº?è?¯ç¶²ä¸?ç?? HTTP/ å®?å?¨å¼? HTTP æ??å??ç?¨ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy host name"
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy password"
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨å¯?ç¢¼"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy port"
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨é?£æ?¥å? "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy username"
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨ä½¿ç?¨è??å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "å??å??æ??é ?è¨é¡¯ç¤ºç??å??ä»¶ç?¸é?? ID æ??å?¥å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr "å¦?æ??ç?º trueï¼?å°?ä»£ç??ä¼ºæ??å?¨ç??é?£ç·?å°±é??è¦?é©?è?ã??å?¶ä¸ä½¿ç?¨è??å??ç¨±æ??å¾? GConf ç??ã??apps/evolution/shell/network_config/authentication_userã??é?µå?¼å??å¾?ï¼?è??å¯?ç¢¼æ??å¾? gnome-keyring æ??ã??~/.gnome2_private/Evolutionã??ç??å¯?ç¢¼æª?æ¡?å??å¾?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Initial attachment view"
 msgstr "å??å§?é??ä»¶æª¢è¦?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Initial file chooser folder"
 msgstr "æª?æ¡?é?¸æ??å°?è©±ç??ç??å??å§?è³?æ??å¤¾"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser å°?è©±ç??ç??å??å§?è³?æ??å¤¾ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
 msgstr "é??ä»¶å·¥å?·å??å??ä»¶ç??å??å§?æª¢è¦?ã??ã??0ã??æ?¯å??ç¤ºï¼?ã??1ã??æ?¯æ¸?å?®æª¢è¦?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "ä¸?æ¬¡å??ç´?ç??çµ?æ??ç??æ?¬"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "è¦?å??æ¥è?³ç£?ç¢?ç??è³?æ??å¤¾ï¼?å?¶è·¯å¾?æ¸?å?® (ä¾?é?¢ç·?ä½¿ç?¨)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ç??ä¸»æ©?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨æ??é?²è¡?èª?è?ç??å¯?ç¢¼ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "SOCKS ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "SOCKS ä»£ç??ä¼ºæ??å?¨é??è¨?å? "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "å®?å?¨å¼? HTTP ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
 msgstr "å®?å?¨å¼? HTTP ä»£ç??ä¼ºæ??å?¨é??è¨?å? "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
 msgstr "é?¸æ??ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?ã??æ?¯æ?´ç??æ?¸å?¼æ?? 0ã?? 1ã?? 2ã?? å?? 3ï¼?å??å?¥ä»£è¡¨ã??ä½¿ç?¨ç³»çµ±è¨å®?å?¼ã??ã??ã??ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ã??ã??ã??ä½¿ç?¨æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??å??ã??ä½¿ç?¨å?¨ autoconfig url ä¸æ??ä¾?ç??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "é¡¯ç¤ºå?´é??æ¬?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "å¿½ç?¥é??ç?¼è¦å??å°?è©±ç??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-#: ../shell/main.c:489
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:321
 msgid "Start in offline mode"
 msgstr "ä»¥é?¢ç·?æ¨¡å¼?å??å??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "ç??æ??å??è¨ç?ºé¡¯ç¤º"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
-msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 msgstr "Evolution ç??çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The default X coordinate for the main window."
+msgstr "ä¸»è¦?çª?ç??é ?è¨ X å??æ¨?ã??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The default Y coordinate for the main window."
+msgstr "ä¸»è¦?çª?ç??é ?è¨ Y å??æ¨?ã??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
 msgstr "ä¸»è¦?çª?ç??é ?è¨é«?åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default width for the main window, in pixels."
 msgstr "ä¸»è¦?çª?ç??é ?è¨é??åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
 msgstr "è³?è¨?æ?¹å¡?å??ç??é ?è¨é??åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
 msgstr "ä¸?æ¬¡å??ç´?ç?? Evolution çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
 msgstr "ç?¨å?¨å®?å?¨å¼? HTTP ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr "socks ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
 msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/http_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
 msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/secure_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
 msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/socks_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "text", "icons", "both", "toolbar", "toolbar"
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
 msgstr "è¦?çª?æ??é??ç??é¢¨æ ¼ã??å?¯ä»¥æ?¯ã??textã??(æ??å?)ã??ã??iconsã??(å??ç¤º)ã??ã??bothã??(å?©è??)ã??ã??toolbarã??(å·¥å?·å??)ã??å¦?æ??è¨ç?ºã??toolbarã??(å·¥å?·å??)ï¼?æ??é??ç??é¢¨æ ¼æ??æ ¹æ?? GNOME å·¥å?·å??è¨å®?å?¼æ±ºå®?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr "é??å??é?µå?¼å??å?«äº?è¦?ç?´æ?¥é?£ç·?ï¼?ä¸?é??é??ä»£ç??ä¼ºæ??å?¨ï¼?å¦?æ??æ??ä½¿ç?¨ï¼?ç??ä¸»æ©?ã??æ?¸å?¼å?¯ä»¥ç?ºä¸»æ©?å??ç¨±ã??ç¶²å??ï¼?é??é ä½¿ç?¨è?¬ç?¨å?ç¬¦å¦? *.foo.comï¼?ã??IP ä½?å??ï¼?IPv4 å?? IPv6 ç??å?¯ï¼?æ??å¸¶æ??å?ç¶²çµ¡é?®ç½©ç??ä½?å??ï¼?å??æ?¯ 192.168.0.0/24ï¼?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "å·¥å?·å??å?¯ä»¥ç??å?°"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr "æ??ä¾?ä»£ç??ä¼ºæ??å?¨çµ?æ??ç??ç¶²å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨æ??ç?¨ä¾?é©?è?ç??ä½¿ç?¨è??å??ç¨±ã??"
 
 # zh_HK: msgstr "Evolution æ?¯å?¦ä»¥é?¢ç·?æ¨¡å¼?å??å??å??ä»£ç·?ä¸?æ¨¡å¼?ã??"
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution æ?¯å?¦ä»¥é?¢ç·?æ¨¡å¼?å??å??å??ä»£ç·?ä¸?æ¨¡å¼?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "è¦?çª?æ?¯å?¦å?¯ä»¥æ??å¤§å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°å?´é??æ¬?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "æ?¯å?¦é¡¯ç¤ºç??æ??å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°å·¥å?·å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:59
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "æ?¯å?¦ç??ç?¥ Evulution é??ç?¼ç??æ?¬ç??è¦å??å°?è©±ç??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "è¦?çª?æ??é??é¢¨æ ¼"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "è¦?çª?æ??é??æ?¯å?¯è¦?ç??"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>ä½?ç?¨ä¸ç??é?£ç·?</b>"
+#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+msgid "Searches"
+msgstr "æ??å°?"
+
+#: ../shell/e-shell-content.c:619
+msgid "Save Search"
+msgstr "å?²å?æ??å°?çµ?æ??"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "ä½?ç?¨ä¸ç??é?£ç·?"
+#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "æ??ã??ç¢ºå®?ã??é??é??é??äº?é?£ç·?ä»¥é?¢ç·?"
+#. 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:687
+msgid "Sho_w:"
+msgstr "é¡¯ç¤º(_W):"
 
-#: ../shell/e-shell-importer.c:128
-msgid "Choose the type of importer to run:"
-msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:714
+msgid "Sear_ch:"
+msgstr "æ??å°?(_C):"
 
-#: ../shell/e-shell-importer.c:131
-msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
-msgstr "é?¸å??è¦?å?¯å?¥ Evolution ç??æª?æ¡?ï¼?ä¸¦ä¸?å?¨æ¸?å?®å?§é?¸å??æª?æ¡?é¡?å??ã??"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:769
+msgid "i_n"
+msgstr "æ?¼(_N)"
 
-#: ../shell/e-shell-importer.c:135
-msgid "Choose the destination for this import"
-msgstr "é?¸æ??æ¤è¼¸å?¥ç??ç?®ç??å?°"
+#: ../shell/e-shell-switcher.c:448
+msgid "Toolbar Style"
+msgstr "å·¥å?·å??æ¨£å¼?"
 
-#: ../shell/e-shell-importer.c:141
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
+#: ../shell/e-shell-switcher.c:449
+msgid "The switcher's toolbar style"
+msgstr "å??æ??ç¨?å¼?å·¥å?·å??æ¨£å¼?"
+
+#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:737
+msgid "Toolbar Visible"
+msgstr "å·¥å?·å??å?¯è¦?æ?§"
+
+#: ../shell/e-shell-switcher.c:466
+msgid "Whether the switcher is visible"
+msgstr "å??æ??ç¨?å¼?æ?¯å?¦ç?ºå?¯è¦?"
+
+#: ../shell/e-shell-utils.c:220
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf)"
+
+#: ../shell/e-shell-utils.c:222
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
+
+#: ../shell/e-shell-utils.c:243
+msgid "All Files (*)"
+msgstr "æ??æ??æª?æ¡? (*)"
+
+#: ../shell/e-shell-view.c:604
+msgid "Switcher Action"
+msgstr "å??æ??ç¨?å¼?å??ä½?"
+
+#: ../shell/e-shell-view.c:605
+msgid "The switcher action for this shell view"
 msgstr ""
-"Evolution å·²ç¶?æª¢æ?¥å¾?ä»¥ä¸?æ??ç?¨ç¨?å¼?è¼¸å?¥ç??\n"
-"è¨å®?å?¼ï¼?Pineã??Netscapeã??Elmã??iCalendarã??æ?¾ä¸?å?°å?¯ä»¥\n"
-"è¼¸å?¥ç??è¨å®?å?¼ã??å¦?æ??ä½ æ?³\n"
-"å??è©¦ä¸?æ¬¡ï¼?è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??æ??é??ã??\n"
 
-#: ../shell/e-shell-importer.c:295
-msgid "F_ilename:"
-msgstr "æª?æ¡?å??ç¨±(_I):"
+#: ../shell/e-shell-view.c:620
+msgid "Page Number"
+msgstr "é ?ç¢¼"
 
-#: ../shell/e-shell-importer.c:300
-msgid "Select a file"
-msgstr "é?¸æ??ä¸?å??æª?æ¡?"
+#: ../shell/e-shell-view.c:621
+msgid "The notebook page number of the shell view"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:309
-msgid "File _type:"
-msgstr "æª?æ¡?é¡?å??(_T):"
+#: ../shell/e-shell-view.c:637
+msgid "Search Rule"
+msgstr "æ??å°?è¦?å??"
 
-#: ../shell/e-shell-importer.c:357
-msgid "Import data and settings from _older programs"
-msgstr "å¾?è??ç¨?å¼?è¼¸å?¥è³?æ??å??è¨å®?å?¼(_O)"
+#: ../shell/e-shell-view.c:638
+msgid "Criteria for the current search results"
+msgstr "ç?®å??ç??æ??å°?çµ?æ??ç??æ¢?ä»¶"
 
-#: ../shell/e-shell-importer.c:360
-msgid "Import a _single file"
-msgstr "å?¯å?¥å?®ä¸?æª?æ¡?(_S)"
+#: ../shell/e-shell-view.c:653
+#, fuzzy
+msgid "The EShellBackend for this shell view"
+msgstr "é¡¯ç¤ºæ??é??æ?¬é??æ?²ç??èªªæ??æ??ä»¶"
 
-#: ../shell/e-shell-importer.c:743
-msgid "_Import"
-msgstr "å?¯å?¥(_I)"
+#: ../shell/e-shell-view.c:668
+#, fuzzy
+msgid "Shell Content Widget"
+msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
 
-#: ../shell/e-shell-settings-dialog.c:312
-msgid "Evolution Preferences"
-msgstr "Evolution å??å¥½è¨å®?"
+#: ../shell/e-shell-view.c:669
+msgid "The content widget appears in a shell window's right pane"
+msgstr ""
 
-#. To translators: This is the window title and %s is the
-#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47
-#: ../shell/e-shell-window.c:324
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+#: ../shell/e-shell-view.c:685
+#, fuzzy
+msgid "Shell Sidebar Widget"
+msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
 
-#: ../shell/e-shell-window-commands.c:69
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "ç³»çµ±ä¼¼ä¹?æ²?æ??å®?è£? GNOME Pilot å·¥å?·ã??"
+#: ../shell/e-shell-view.c:686
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:78
-#, c-format
-msgid "Error executing %s. (%s)"
-msgstr "å?·è¡? %s ç?¼ç??é?¯èª¤ã??(%s)"
+#: ../shell/e-shell-view.c:701
+#, fuzzy
+msgid "Shell Taskbar Widget"
+msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
 
-#: ../shell/e-shell-window-commands.c:135
-msgid "Bug buddy is not installed."
-msgstr "æ?ªå®?è£?è¨è¨?é?¯èª¤é?¨ä»½ã??"
+#: ../shell/e-shell-view.c:702
+msgid "The taskbar widget appears at the bottom of a shell window"
+msgstr ""
+
+#: ../shell/e-shell-view.c:717
+#, fuzzy
+msgid "Shell Window"
+msgstr "è¦?çª?é«?åº¦"
+
+#: ../shell/e-shell-view.c:718
+msgid "The window to which the shell view belongs"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:138
-msgid "Bug buddy could not be run."
-msgstr "ç?¡æ³?å?·è¡? Bug buddyã??"
+#: ../shell/e-shell-view.c:734
+msgid "The key file holding widget state data"
+msgstr "å?æ?¾è¦?çª?å??ä»¶ç??æ??è³?æ??ç??è¨å®?é?µæª?æ¡?"
+
+#: ../shell/e-shell-view.c:749
+#, fuzzy
+msgid "The title of the shell view"
+msgstr "é¡¯ç¤ºä¸»å·¥å?·å??"
+
+#: ../shell/e-shell-view.c:763
+msgid "Current View ID"
+msgstr "ç?®å??ç??æª¢è¦? ID"
+
+#: ../shell/e-shell-view.c:764
+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.
-#: ../shell/e-shell-window-commands.c:938
+#: ../shell/e-shell-window-actions.c:644
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
@@ -18923,133 +19138,420 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-commands.c:949
+#: ../shell/e-shell-window-actions.c:655
 msgid "Evolution Website"
 msgstr "Evolution ç¶²ç«?"
 
+#: ../shell/e-shell-window-actions.c:1223
+msgid "Bug Buddy is not installed."
+msgstr "å°?æ?ªå®?è£? Bug Buddyã??"
+
+#: ../shell/e-shell-window-actions.c:1225
+msgid "Bug Buddy could not be run."
+msgstr "ç?¡æ³?å?·è¡? Bug Buddyã??"
+
+#: ../shell/e-shell-window-actions.c:1327
+msgid "GNOME Pilot is not installed."
+msgstr "å°?æ?ªå®?è£? GNOME Pilotã??"
+
+#: ../shell/e-shell-window-actions.c:1329
+msgid "GNOME Pilot could not be run."
+msgstr "ç?¡æ³?å?·è¡? GNOME Pilotã??"
+
+#: ../shell/e-shell-window-actions.c:1423
+msgid "Show information about Evolution"
+msgstr "é¡¯ç¤º Evolution ç?¸é??è³?è¨?"
+
+#: ../shell/e-shell-window-actions.c:1428
+msgid "_Close Window"
+msgstr "é??é??è¦?çª?(_C)"
+
+#: ../shell/e-shell-window-actions.c:1435
+msgid "_Contents"
+msgstr "å?§å®¹(_C)"
+
+#: ../shell/e-shell-window-actions.c:1437
+msgid "Open the Evolution User Guide"
+msgstr "é??å?? Evolution ä½¿ç?¨è??æ??å??"
+
+#: ../shell/e-shell-window-actions.c:1463
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
+
+#: ../shell/e-shell-window-actions.c:1465
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "é??å??å¸¸è¦?å??é¡?(FAQ)ç¶²é ?"
+
+#: ../shell/e-shell-window-actions.c:1470
+msgid "_Forget Passwords"
+msgstr "é?ºå¿?å¯?ç¢¼(_F)"
+
+#: ../shell/e-shell-window-actions.c:1472
+msgid "Forget all remembered passwords"
+msgstr "å¿?è¨?æ??æ??è¨?æ?¶ç??å¯?ç¢¼"
+
+#: ../shell/e-shell-window-actions.c:1477
+msgid "I_mport..."
+msgstr "å?¯å?¥(_M)..."
+
+#: ../shell/e-shell-window-actions.c:1479
+msgid "Import data from other programs"
+msgstr "å?¯å?¥å?¶ä»?ç¨?å¼?ç??è³?æ??"
+
+#: ../shell/e-shell-window-actions.c:1484
+msgid "New _Window"
+msgstr "é??æ?°è¦?çª?(_W)"
+
+#: ../shell/e-shell-window-actions.c:1486
+msgid "Create a new window displaying this view"
+msgstr "å»ºç«?ä¸?å??æ?°ç??è¦?çª?ä¾?é¡¯ç¤ºé??å??æª¢è¦?"
+
+#: ../shell/e-shell-window-actions.c:1500
+msgid "Configure Evolution"
+msgstr "è¨å®? Evolution"
+
+#: ../shell/e-shell-window-actions.c:1505
+msgid "_Quick Reference"
+msgstr "å¿«é??å??å¥½è¨å®?(_Q)"
+
+#: ../shell/e-shell-window-actions.c:1507
+msgid "Show Evolution's shortcut keys"
+msgstr "é¡¯ç¤º Evolution ç??æ?·å¾?é?µ"
+
+#: ../shell/e-shell-window-actions.c:1514
+msgid "Exit the program"
+msgstr "é?¢é??é??å??ç¨?å¼?"
+
+#: ../shell/e-shell-window-actions.c:1519
+msgid "_Advanced Search..."
+msgstr "é?²é??æ??å°?(_A)..."
+
+#: ../shell/e-shell-window-actions.c:1521
+msgid "Construct a more advanced search"
+msgstr "å»ºç«?æ?´é?²é??ç??æ??å°?"
+
+#: ../shell/e-shell-window-actions.c:1528
+msgid "Clear the current search parameters"
+msgstr "æ¸?é?¤ç?®å??ç??æ??å°?å??æ?¸"
+
+#: ../shell/e-shell-window-actions.c:1533
+msgid "_Edit Saved Searches..."
+msgstr "ç·¨è¼¯å?²å?ç??æ??å°?çµ?æ??(_E)..."
+
+#: ../shell/e-shell-window-actions.c:1535
+msgid "Manage your saved searches"
+msgstr "ç®¡ç??ä½ å·²å?²å?ç??æ??å°?"
+
+#: ../shell/e-shell-window-actions.c:1542
+msgid "Click here to change the search type"
+msgstr "æ??é??è£?ä»¥æ?¹è®?æ??å°?é¡?å??"
+
+#: ../shell/e-shell-window-actions.c:1547
+msgid "_Find Now"
+msgstr "ç«?å?³æ??å°?(_F)"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1549
+msgid "Execute the current search parameters"
+msgstr "å?·è¡?ç?®å??ç??æ??å°?å??æ?¸"
+
+#: ../shell/e-shell-window-actions.c:1554
+msgid "_Save Search..."
+msgstr "å?²å?æ??å°?çµ?æ??(_S)..."
+
+#: ../shell/e-shell-window-actions.c:1556
+msgid "Save the current search parameters"
+msgstr "å?²å?ç?®å??ç??æ??å°?å??æ?¸"
+
+#: ../shell/e-shell-window-actions.c:1568
+msgid "Send / _Receive"
+msgstr "å?³é??/æ?¥æ?¶(_R)"
+
+#: ../shell/e-shell-window-actions.c:1570
+msgid "Send queued items and retrieve new items"
+msgstr "å?³é??å¾?é??ç??é ?ç?®ä¸¦æ?¥æ?¶æ?°ç??é ?ç?®"
+
+#: ../shell/e-shell-window-actions.c:1575
+msgid "Submit _Bug Report..."
+msgstr "å?³é??é?¯èª¤å ±å??(_B)..."
+
+#: ../shell/e-shell-window-actions.c:1577
+msgid "Submit a bug report using Bug Buddy"
+msgstr "ä½¿ç?¨ Bug Buddy é??å?ºé?¯èª¤å ±å??ã??"
+
+#: ../shell/e-shell-window-actions.c:1582
+msgid "GNOME Pilot _Synchronization..."
+msgstr "GNOME Pilot å??æ¥å??(_S)..."
+
+#: ../shell/e-shell-window-actions.c:1584
+msgid "Set up GNOME Pilot configuration"
+msgstr "è¨å®? GNOME Pilot çµ?æ??"
+
+#: ../shell/e-shell-window-actions.c:1589
+msgid "_Work Offline"
+msgstr "é?¢ç·?å·¥ä½?(_W)"
+
+#: ../shell/e-shell-window-actions.c:1591
+msgid "Put Evolution into offline mode"
+msgstr "è®? Evolution é?²å?¥é?¢ç·?æ¨¡å¼?"
+
 # zh_HK: msgstr "ç·?ä¸?å·¥ä½?(_W)"
-#: ../shell/e-shell-window-commands.c:1163
+#: ../shell/e-shell-window-actions.c:1596
 msgid "_Work Online"
 msgstr "ç·?ä¸?å·¥ä½?(_W)"
 
-#: ../shell/e-shell-window-commands.c:1176
-#: ../ui/evolution.xml.h:57
-msgid "_Work Offline"
-msgstr "é?¢ç·?å·¥ä½?(_W)"
+# zh_HK: msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
+#: ../shell/e-shell-window-actions.c:1598
+msgid "Put Evolution into online mode"
+msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
+
+#: ../shell/e-shell-window-actions.c:1626
+msgid "Lay_out"
+msgstr "ä½?å±?(_O)"
 
-#: ../shell/e-shell-window-commands.c:1189
-msgid "Work Offline"
-msgstr "é?¢ç·?å·¥ä½?"
+#: ../shell/e-shell-window-actions.c:1633
+msgid "_New"
+msgstr "æ?°å¢?(_N)"
 
-# zh_HK: msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
-#: ../shell/e-shell-window.c:372
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
+#: ../shell/e-shell-window-actions.c:1640
+msgid "_Search"
+msgstr "æ??å°?(_S)"
 
-#: ../shell/e-shell-window.c:379
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution æ£å?¨é?¢ç·?ç??ç¨?åº?ä¸ã??"
+#: ../shell/e-shell-window-actions.c:1647
+msgid "_Switcher Appearance"
+msgstr "å??æ??å¤?è§?(_S)"
 
-# zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
-#: ../shell/e-shell-window.c:386
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
-msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+#: ../shell/e-shell-window-actions.c:1661
+msgid "_Window"
+msgstr "è¦?çª?(_O)"
+
+#: ../shell/e-shell-window-actions.c:1690
+msgid "Show Side _Bar"
+msgstr "é¡¯ç¤ºå?´é??æ¬?(_B)"
+
+#: ../shell/e-shell-window-actions.c:1692
+msgid "Show the side bar"
+msgstr "é¡¯ç¤ºå?´é??å??"
+
+#: ../shell/e-shell-window-actions.c:1698
+msgid "Show _Buttons"
+msgstr "é¡¯ç¤ºæ??é??(_B)"
+
+#: ../shell/e-shell-window-actions.c:1700
+msgid "Show the switcher buttons"
+msgstr "é¡¯ç¤ºå??æ??ç¨?å¼?æ??é??"
+
+#: ../shell/e-shell-window-actions.c:1706
+msgid "Show _Status Bar"
+msgstr "é¡¯ç¤ºç??æ??å??(_S)"
+
+#: ../shell/e-shell-window-actions.c:1708
+msgid "Show the status bar"
+msgstr "é¡¯ç¤ºç??æ??å??"
+
+#: ../shell/e-shell-window-actions.c:1714
+msgid "Show _Tool Bar"
+msgstr "é¡¯ç¤ºå·¥å?·å??(_T)"
+
+#: ../shell/e-shell-window-actions.c:1716
+msgid "Show the tool bar"
+msgstr "é¡¯ç¤ºå·¥å?·å??"
+
+#: ../shell/e-shell-window-actions.c:1738
+msgid "_Icons Only"
+msgstr "å?ªæ??å??ç¤º(_I)"
+
+#: ../shell/e-shell-window-actions.c:1740
+msgid "Display window buttons with icons only"
+msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??å??ç¤º"
+
+#: ../shell/e-shell-window-actions.c:1745
+msgid "_Text Only"
+msgstr "å?ªæ??æ??å?(_T)"
+
+#: ../shell/e-shell-window-actions.c:1747
+msgid "Display window buttons with text only"
+msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??æ??å?"
+
+#: ../shell/e-shell-window-actions.c:1752
+msgid "Icons _and Text"
+msgstr "å??ç¤ºå??æ??å?(_A)"
+
+#: ../shell/e-shell-window-actions.c:1754
+msgid "Display window buttons with icons and text"
+msgstr "é¡¯ç¤ºè¦?çª?æ??é??ç??å??ç¤ºå??æ??å?"
+
+#: ../shell/e-shell-window-actions.c:1759
+msgid "Tool_bar Style"
+msgstr "å·¥å?·å??é¢¨æ ¼(_B)"
+
+#: ../shell/e-shell-window-actions.c:1761
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "ä½¿ç?¨æ¡?é?¢å·¥å?·å??è¨å®?å?¼é¡¯ç¤ºè¦?çª?æ??é??"
+
+#: ../shell/e-shell-window-actions.c:1769
+msgid "Define Views..."
+msgstr "å®?ç¾©æª¢è¦?..."
+
+#: ../shell/e-shell-window-actions.c:1771
+msgid "Create or edit views"
+msgstr "å»ºç«?æ??ç·¨è¼¯æª¢è¦?(_C)"
+
+#: ../shell/e-shell-window-actions.c:1776
+msgid "Save Custom View..."
+msgstr "å?²å?è?ªé?¸æª¢è¦?..."
+
+#: ../shell/e-shell-window-actions.c:1778
+msgid "Save current custom view"
+msgstr "å?²å?ç?®å??ç??è?ªé?¸æª¢è¦?"
+
+#: ../shell/e-shell-window-actions.c:1785
+msgid "C_urrent View"
+msgstr "ç?®å??æª¢è¦?(_U)"
+
+#: ../shell/e-shell-window-actions.c:1795
+msgid "Custom View"
+msgstr "è?ªé?¸æª¢è¦?"
+
+#: ../shell/e-shell-window-actions.c:1797
+msgid "Current view is a customized view"
+msgstr "ç?®å??ç??æª¢è¦?æ?¹å¼?æ?¯è?ªé?¸ç??æª¢è¦?"
 
-#: ../shell/e-shell-window.c:778
+#: ../shell/e-shell-window-actions.c:1807
+msgid "Change the page settings for your current printer"
+msgstr "ä¿®æ?¹ç?®å??æ??å?°æ©?ç??é ?é?¢æ??å?°è¨å®?"
+
+#: ../shell/e-shell-window-actions.c:2127
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ??è?³ %s"
 
-#: ../shell/e-shell.c:634
-msgid "Unknown system error."
-msgstr "ä¸?æ??ç??ç³»çµ±é?¯èª¤ã??"
+#: ../shell/e-shell-window-actions.c:2337
+msgid "Execute these search parameters"
+msgstr "å?·è¡?é??äº?æ??å°?å??æ?¸"
 
-#: ../shell/e-shell.c:832
-#: ../shell/e-shell.c:833
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:552
 #, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/e-shell.c:1251
-#: ../widgets/misc/e-cell-date-edit.c:320
-msgid "OK"
-msgstr "ç¢ºå®?"
+#: ../shell/e-shell-window.c:360
+msgid "New"
+msgstr "æ?°å¢?"
 
-#: ../shell/e-shell.c:1253
-msgid "Invalid arguments"
-msgstr "ç?¡æ??ç??å¼?æ?¸"
+#: ../shell/e-shell-window.c:613
+#, fuzzy
+msgid "Active Shell View"
+msgstr "é¡¯ç¤ºä¸»å·¥å?·å??"
 
-#: ../shell/e-shell.c:1255
-msgid "Cannot register on OAF"
-msgstr "ä¸?è?½æ?¼ OAF è¨»å??"
+#: ../shell/e-shell-window.c:614
+#, fuzzy
+msgid "Name of the active shell view"
+msgstr "æª¢è¦?å?¨ <b>Google ç¨?å¼?ç¢¼æ??å°?</b> ä¸ç?? <i>%(name)s</i>"
 
-#: ../shell/e-shell.c:1257
-msgid "Configuration Database not found"
-msgstr "æ?¾ä¸?å?°çµ?æ??è³?æ??åº«"
+#: ../shell/e-shell-window.c:629
+#, fuzzy
+msgid "The shell window's EFocusTracker"
+msgstr "é??å§?æ??è¦?çª?ç??ä½?ç½®"
 
-#: ../shell/e-user-creatable-items-handler.c:674
-#: ../shell/e-user-creatable-items-handler.c:684
-#: ../shell/e-user-creatable-items-handler.c:689
-msgid "New"
-msgstr "æ?°å¢?"
+#: ../shell/e-shell-window.c:643 ../shell/e-shell.c:772
+msgid "Geometry"
+msgstr "ä½?ç½®å¤§å°?"
 
-#: ../shell/test/evolution-test-component.c:103
-msgid "New Test"
-msgstr "æ?°æ¸¬è©¦"
+#: ../shell/e-shell-window.c:644 ../shell/e-shell.c:773
+msgid "Initial window geometry string"
+msgstr "è¦?çª?å??å§?å¤§å°?å?ä¸²"
 
-#: ../shell/test/evolution-test-component.c:104
-msgctxt "New"
-msgid "_Test"
-msgstr "æ¸¬è©¦(_T)"
+#: ../shell/e-shell-window.c:659
+msgid "Safe Mode"
+msgstr "å®?å?¨æ¨¡å¼?"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "Create a new test item"
-msgstr "å»ºç«?æ?°ç??æ¸¬è©¦é ?ç?®"
+#: ../shell/e-shell-window.c:660
+#, fuzzy
+msgid "Whether the shell window is in safe mode"
+msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "æ??ã??å?¯å?¥ã??é??å§?å°?æª?æ¡?å?¯å?¥å?° Evolutionã??"
+#: ../shell/e-shell-window.c:691
+msgid "Sidebar Visible"
+msgstr "å?´é??æ¬?å?¯è¦?æ?§"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Evolution å?¯å?¥å?©ç??"
+#: ../shell/e-shell-window.c:692
+#, fuzzy
+msgid "Whether the shell window's side bar is visible"
+msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "è¼¸å?¥æª?æ¡?"
+#: ../shell/e-shell-window.c:706
+msgid "Switcher Visible"
+msgstr "å??æ??ç¨?å¼?å?¯è¦?æ?§"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "è¼¸å?¥ä½?ç½®"
+#: ../shell/e-shell-window.c:707
+#, fuzzy
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "è¼¸å?¥å?¨é¡?å??"
+#: ../shell/e-shell-window.c:722
+msgid "Taskbar Visible"
+msgstr "å·¥ä½?å??å?¯è¦?æ?§"
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "é?¸æ??è¦?å?¯å?¥ç??è³?è¨?"
+#: ../shell/e-shell-window.c:723
+#, fuzzy
+msgid "Whether the shell window's task bar is visible"
+msgstr "æ?¯å?¦é¡¯ç¤ºç??æ??å??ã??"
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "é?¸å??æª?æ¡?"
+#: ../shell/e-shell-window.c:738
+#, fuzzy
+msgid "Whether the shell window's tool bar is visible"
+msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
 
-#: ../shell/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"æ¡è¿?ä½¿ç?¨ Evolution ç??å?¯å?¥å?©ç??ã??\n"
-"é??å??ç²¾é??å°?æ??é ?å°?ä½ å¦?ä½?å°?å¤?é?¨ç??æª?æ¡?\n"
-"å?¯å?¥å?° Evolutionã??"
+#: ../shell/e-shell-window.c:752
+msgid "UI Manager"
+msgstr "UI ç®¡ç??ç¨?å¼?"
+
+#: ../shell/e-shell-window.c:753
+#, fuzzy
+msgid "The shell window's GtkUIManager"
+msgstr "é??å§?æ??è¦?çª?ç??ä½?ç½®"
+
+#: ../shell/e-shell.c:213
+msgid "Preparing to go offline..."
+msgstr "æº?å??é?²å?¥é?¢ç·?..."
+
+#: ../shell/e-shell.c:267
+msgid "Preparing to go online..."
+msgstr "æº?å??é?²å?¥ä¸?ç·?..."
+
+#: ../shell/e-shell.c:339
+msgid "Preparing to quit..."
+msgstr "æº?å??çµ?æ??..."
+
+#: ../shell/e-shell.c:788
+msgid "Module Directory"
+msgstr "æ¨¡çµ?ç?®é??"
+
+#: ../shell/e-shell.c:789
+msgid "The directory from which to load EModules"
+msgstr "ç?¨ä¾?è¼?å?¥ EModules ç??ç?®é??"
+
+#: ../shell/e-shell.c:804
+msgid "Network Available"
+msgstr "ç¶²çµ¡å?¯ä½¿ç?¨"
+
+#: ../shell/e-shell.c:805
+msgid "Whether the network is available"
+msgstr "ç¶²çµ¡æ?¯å?¦å?¯ä»¥ä½¿ç?¨"
+
+#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
+msgid "Online"
+msgstr "ä¸?ç·?"
+
+#: ../shell/e-shell.c:821
+#, fuzzy
+msgid "Whether the shell is online"
+msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:226
+#: ../shell/main.c:166
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19084,7 +19586,7 @@ msgstr ""
 "æ??å??å¸?æ??ä½ äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??ä½ æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:190
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19092,44 +19594,56 @@ msgstr ""
 "è¬?è¬?\n"
 "Evolution å°?çµ?æ?¬ä¸?\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:197
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:317
 msgid "Start Evolution activating the specified component"
 msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??ä»¶"
 
+#: ../shell/main.c:319
+msgid "Apply the given geometry to the main window"
+msgstr "å°?æ??å®?ç??å°ºå¯¸å¥?ç?¨å?°ä¸»è¦?çª?"
+
 # zh_HK: msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
-#: ../shell/main.c:491
+#: ../shell/main.c:323
 msgid "Start in online mode"
 msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
 
-#: ../shell/main.c:494
-msgid "Forcibly shut down all Evolution components"
-msgstr "å¼·å?¶é??é??æ??æ?? Evoultion å??ä»¶"
+#: ../shell/main.c:326
+msgid "Forcibly shut down Evolution"
+msgstr "å¼·å?¶é??é?? Evoultion"
 
-#: ../shell/main.c:498
+#: ../shell/main.c:330
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "å¼·å?¶å¾? Evolution 1.4 é??æ?°ç§»è½?"
 
-#: ../shell/main.c:501
+#: ../shell/main.c:333
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??ä»¶ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:503
+#: ../shell/main.c:335
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:505
+#: ../shell/main.c:337
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??è?¯çµ¡äººå??å·¥ä½?ç??é ?è¦½çª?æ ¼ã??"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:341
+msgid "Import URIs or file names given as rest of arguments."
+msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??ç¨±å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
+
+#: ../shell/main.c:343
+msgid "Request a running Evolution process to quit"
+msgstr "è¦?æ±?å?·è¡?ä¸ç?? Evolution ç¨?åº?çµ?æ??"
+
+#: ../shell/main.c:497
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:642
+#: ../shell/main.c:523
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19143,40 +19657,38 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "ä½ ç¢ºå®?è¦?é?ºå¿?æ??æ??è¨?æ?¶ç??å¯?ç¢¼ï¼?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "ç?¡æ³?å??å?? Evolution"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "ç¹¼çº?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "å¾? {0} ç??å?ªé?¤è??è³?æ??ï¼?"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "Evolution ç?¡æ³?å??å??ã??"
-
-#: ../shell/shell.error.xml.h:6
-msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+#: ../shell/shell.error.xml.h:4
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
 msgstr "é?ºå¿?ä½ ç??å¯?ç¢¼æ??å?ªé?¤æ??æ??å·²è¨?æ?¶ç??å¯?ç¢¼ã??å?¨ä¸?æ¬¡é??è¦?ä½¿ç?¨å¯?ç¢¼æ??å°?æ??æ??ç¤ºä½ è¼¸å?¥ã??"
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
 msgstr "ç£?ç¢?ç©ºé??ä¸?è¶³ï¼?ç?¡æ³?å??ç´?ã??"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤è??è³?æ??ï¼?"
 
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
+"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"
+"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"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
 msgstr ""
 "ã??evolutionã??ç?®é??ç??æ??æ??å?§å®¹å?³å°?æ°¸ä¹?ç§»é?¤ã??\n"
 "\n"
@@ -19184,77 +19696,140 @@ msgstr ""
 "\n"
 "å?ªé?¤ä¹?å¾?ï¼?æ?ªç¶?æ??å??æ??ä½?ï¼?ä¾¿ç?¡æ³?é??ç´?è?³è??ç?? Evolution ç??æ?¬ã??\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../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"
+"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 ""
 "è??ç?? Evolution ç??æ?¬å°?å?¶è³?æ??å?²å?å?¨ä¸?å??ç??ä½?ç½®ã??\n"
 "\n"
 "å¦?æ??é?¸æ??ç§»é?¤æ¤è³?æ??ï¼?å°?æ??æ°¸ä¹?ç§»é?¤ &quot;evolution&quot; ç?®é??ç??æ??æ??å?§å®¹ã??å¦?æ??é?¸æ??ä¿?ç??æ¤è³?æ??ï¼?å°±å?¯ä»¥å?¨æ?¹ä¾¿ç??æ??å??ï¼?æ??å??ç§»é?¤ &quot;evolution&quot; ç??å?§å®¹ã??\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
-msgstr "å¾?ä»¥å??ç??ç??æ?¬å??ç´?å¤±æ??ï¼?{0}"
+#: ../shell/shell.error.xml.h:18
+msgid "Upgrade from previous version failed:"
+msgstr "å¾?ä»¥å??ç??ç??æ?¬å??ç´?å¤±æ??ï¼?"
 
-#: ../shell/shell.error.xml.h:21
+#: ../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"
+"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."
+"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:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"ä½ ç??ç³»çµ±çµ?æ??è?? Evolution çµ?æ??ä¸?ç?¸ç¬¦ã??\n"
-"\n"
-"å¦?é??è©³ç´°è³?è¨?ï¼?è«?æ??ä¸?ä¸?æ±?å?©ã??"
-
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"ä½ ç??ç³»çµ±çµ?æ??è?? Evolution çµ?æ??ä¸?ç?¸ç¬¦ï¼?\n"
-"\n"
-"{0}\n"
-"\n"
-"å¦?é??è©³ç´°è³?è¨?ï¼?è«?æ??ä¸?ä¸?æ±?å?©ã??"
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "é?ºå¿?(_F)"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "ä¿?ç??è³?æ??(_K)"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
 msgstr "ç¨?å¾?æ??é??æ??(_R)"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
-"{1}\n"
+"{0}\n"
 "\n"
-"å¦?æ??ä½ é?¸æ??ç¹¼çº?ï¼?å?¯è?½ç?¡æ³?å?å??é?¨ä»½è??è³?æ??ã??\n"
+"å¦?æ??ä½ é?¸æ??ç¹¼çº?ï¼?å?¯è?½ç?¡æ³?å?å??é?¨å??è??è³?æ??ã??\n"
+
+#: ../shell/test/e-test-shell-backend.c:60
+msgctxt "New"
+msgid "_Test Item"
+msgstr "æ¸¬è©¦é ?ç?®(_T)"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "å»ºç«?æ?°ç??æ¸¬è©¦é ?ç?®"
+
+#: ../shell/test/e-test-shell-backend.c:70
+msgctxt "New"
+msgid "Test _Source"
+msgstr "æ¸¬è©¦ä¾?æº?(_S)"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../shell/test/e-test-shell-backend.c:72
+msgid "Create a new test source"
+msgstr "å»ºç«?æ?°ç??æ¸¬è©¦ä¾?æº?"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "æª?æ¡?ä¸?æ?¯æ??æ??ç?? .desktop æª?æ¡?"
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "ç?¡æ³?è¾¨è?ç??æ¡?é?¢æª?æ¡?ç??æ?¬ã??%sã??"
+
+#: ../smclient/eggdesktopfile.c:958
+#, c-format
+msgid "Starting %s"
+msgstr "æº?å??å??å?? %s"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "æ??ç?¨ç¨?å¼?ä¸?æ?¥å??ä»¥å?½ä»¤å??é??å??æ??ä»¶"
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "ç?¡æ³?è¾¨è?ç??å??å??é?¸é ?ï¼?%d"
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "ä¸?è?½å?³é??æ??ä»¶ URI è?³ã??Type=Linkã??æ¡?é?¢é ?ç?®"
+
+#: ../smclient/eggdesktopfile.c:1394
+#, c-format
+msgid "Not a launchable item"
+msgstr "ä¸?æ?¯å?¯ä»¥å??å??ç??é ?ç?®"
+
+#: ../smclient/eggsmclient.c:227
+msgid "Disable connection to session manager"
+msgstr "å??ç?¨å?°ä½?æ¥é??æ®µç®¡ç??ç¨?å¼?ç??é?£ç·?"
+
+#: ../smclient/eggsmclient.c:230
+msgid "Specify file containing saved configuration"
+msgstr "æ??å®?å??å?«å·²å?²å?çµ?æ??ç??æª?æ¡?"
+
+#: ../smclient/eggsmclient.c:230
+msgid "FILE"
+msgstr "æª?æ¡?"
+
+#: ../smclient/eggsmclient.c:233
+msgid "Specify session management ID"
+msgstr "æ??å®?ä½?æ¥é??æ®µç®¡ç?? ID"
+
+#: ../smclient/eggsmclient.c:233
+msgid "ID"
+msgstr "ID"
+
+#: ../smclient/eggsmclient.c:254
+msgid "Session management options:"
+msgstr "ä½?æ¥é??æ®µç®¡ç??é?¸é ?ï¼?"
+
+#: ../smclient/eggsmclient.c:255
+msgid "Show session management options"
+msgstr "é¡¯ç¤ºä½?æ¥é??æ®µç®¡ç??é?¸é ?"
+
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19265,64 +19840,73 @@ msgstr ""
 "\n"
 "ç·¨è¼¯ä¿¡ä»»è¨å®?å?¼ï¼?"
 
-#: ../smime/gui/cert-trust-dialog.c:150
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+#: ../smime/gui/cert-trust-dialog.c:144
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
 msgstr "å? ç?ºä½ ä¿¡ä»»ç?¼å?ºæ¤è?æ?¸ç??è?æ?¸å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??ä½ å°?ä¿¡ä»»æ¤è?æ?¸ç??æ??æ??æ?§ã??"
 
-#: ../smime/gui/cert-trust-dialog.c:154
-msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+#: ../smime/gui/cert-trust-dialog.c:148
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
 msgstr "å? ç?ºä½ ä¸?ä¿¡ä»»ç?¼å?ºæ¤è?æ?¸ç??è?æ?¸å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??ä½ å°?ä¸?ä¿¡ä»»æ¤è?æ?¸ç??æ??æ??æ?§ã??"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:611
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "é?¸å??è¦?å?¯å?¥ç??è?æ?¸..."
 
-#: ../smime/gui/certificate-manager.c:145
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "æ??æ??ç?? PKCS12 æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:398
-#: ../smime/gui/certificate-manager.c:625
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "æ??æ??æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:275
-#: ../smime/gui/certificate-manager.c:488
-#: ../smime/gui/certificate-manager.c:713
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "è?æ?¸å??ç¨±"
 
-#: ../smime/gui/certificate-manager.c:284
-#: ../smime/gui/certificate-manager.c:506
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "ç?¨é??"
 
-#: ../smime/gui/certificate-manager.c:293
-#: ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "åº?è??"
 
-#: ../smime/gui/certificate-manager.c:301
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "å?°æ??"
 
-#: ../smime/gui/certificate-manager.c:392
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "æ??æ??ç??é?»å?é?µä»¶è?æ?¸æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:497
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "é?»å?é?µä»¶å?°å??"
 
-#: ../smime/gui/certificate-manager.c:620
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "æ??æ??ç?? CA è?æ?¸æª?æ¡?"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-manager.c:1050
+msgid "Certificates"
+msgstr "è?æ?¸"
+
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "è?æ?¸æª¢è¦?å?¨:%s"
@@ -19342,7 +19926,7 @@ msgid "Enter new password"
 msgstr "è¼¸å?¥æ?°å¯?ç¢¼"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19351,7 +19935,7 @@ msgstr ""
 "ç?¼çµ¦:\n"
 "  ä¸»æ?¨ï¼?%s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19360,1705 +19944,365 @@ msgstr ""
 "ç?¼ç?§è??:\n"
 "  ä¸»æ?¨ï¼?%s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "é?¸å??è?æ?¸"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<ä¸?æ?¯è?æ?¸ç??é?¨ä»½>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>è?æ?¸æ¬?ä½?</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>è?æ?¸é??å±¤</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>æ¬?ä½?å?¼</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>æ?¸ç¢¼æ??ç´?</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>ç?¼è¡?è??:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>ç?¼çµ¦</b>"
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>æ¤è?æ?¸å·²ç¶?æª¢é©?ç?¨é??:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>æ??å??</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "æ¬?å¨?"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "å??ä»½"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "å?¨é?¨å??ä»½"
 
-#: ../smime/gui/smime-ui.glade.h:13
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+#: ../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)."
 msgstr "ä¿¡ä»»æ¤æ ¸è?æ©?é??ä¹?å??ï¼?å¦?æ??å?¯ä»¥ç??è©±ï¼?ä½ æ??è©²å??æª¢æ?¥å®?ç??è?æ?¸ä»¥å??å®?ç??æ?¿ç?å??ç¨?åº?ã??"
 
-#: ../smime/gui/smime-ui.glade.h:14
-#: ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "è?æ?¸"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "æ ¸è?æ©?é??ä¿¡ä»»åº¦"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Fields"
+msgstr "è?æ?¸æ¬?ä½?"
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate Hierarchy"
+msgstr "è?æ?¸é??å±¤"
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "è?æ?¸è©³ç´°è³?è¨?"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "è?æ?¸è¡¨æ ¼"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "ä¸?è?¬å??ç¨± (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "è?¯çµ¡äººè?æ?¸"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Do not trust the authenticity of this certificate"
 msgstr "ä¸?ä¿¡ä»»æ¤è?æ?¸ç??æ??æ??æ?§"
 
-#: ../smime/gui/smime-ui.glade.h:22
-msgid "Dummy window only"
-msgstr "é??è??æ?¬è¦?çª?"
-
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Edit"
 msgstr "ç·¨è¼¯"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "é?»å?é?µä»¶è?æ?¸ä¿¡ä»»è¨å®?å?¼"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "é?»å?é?µä»¶æ?¶ä»¶è??è?æ?¸"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "é?»å?é?µä»¶ç°½ç½²è??è?æ?¸"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "å?°æ??æ?¥æ??"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "Field Value"
+msgstr "æ¬?ä½?æ?¸å?¼"
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Fingerprints"
+msgstr "æ?¸ç¢¼æ??ç´?"
+
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "å?¯å?¥"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Issued By"
+msgstr "ç?¼ç?§è??"
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "ç?¼ç?§æ?¥æ??"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Issued To"
+msgstr "ç?¼çµ¦"
+
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "MD5 æ??ç´?"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "çµ?ç¹? (O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "çµ?ç¹?å?®ä½? (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 æ??ç´?"
 
-#: ../smime/gui/smime-ui.glade.h:35
-#: ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL ç?¨æ?¶ç«¯è?æ?¸"
 
-#: ../smime/gui/smime-ui.glade.h:36
-#: ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL ä¼ºæ??å?¨è?æ?¸"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:35
+msgid "This certificate has been verified for the following uses:"
+msgstr "æ¤è?æ?¸å·²ç¶?æª¢é©?ç?¨æ?¼ä¸?å??ç?¨é??ï¼?"
+
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "ä¿¡ä»»æ¤è?æ?¸ç??æ??æ??æ?§"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust this CA to identify email users."
 msgstr "ä¿¡ä»»æ¤æ ¸è?æ©?é?? (CA) ä¾?è?å?¥é?»å?é?µä»¶ä½¿ç?¨è??ã??"
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "ä¿¡ä»»æ¤æ ¸è?æ©?é?? (CA) ä¾?è?å?¥è»?ä»¶é??ç?¼äººå?¡ã??"
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "ä¿¡ä»»æ¤æ ¸è?æ©?é?? (CA) ä¾?è?å?¥ç¶²ç«?ã??"
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:40
+msgid "Validity"
+msgstr "æ??æ??æ?§"
+
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "æª¢è¦?"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "ä½ å·²ç¶?æ??ä¾?è?ªé??äº?çµ?ç¹?ç??è?æ?¸ï¼?å?¯ä»¥è?å?¥ä½ ç??èº«ä»½:"
 
-#: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+#: ../smime/gui/smime-ui.ui.h:43
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "ä½ å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??è?æ?¸ï¼?å?¯ä»¥è?å?¥é??äº?æ ¸è?æ©?é??:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "ä½ å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??è?æ?¸ï¼?å?¯ä»¥è?å?¥é??äº?äººå?¡:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "ä½ ç??è?æ?¸"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_Edit CA Trust"
 msgstr "ç·¨è¼¯æ ¸è?æ©?é?? (_CA) ä¿¡ä»»åº¦"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:711
 msgid "Certificate already exists"
 msgstr "è?æ?¸å·²ç¶?å?å?¨"
 
-#: ../smime/lib/e-cert.c:222
-#: ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "ç°½ç½²"
 
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "å? å¯?"
 
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "ç??æ?¬"
 
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "ç??æ?¬ 1"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "ç??æ?¬ 2"
 
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "ç??æ?¬ 3"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "è?æ?¸å¯?ç¢¼å??ä½¿ç?¨"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "Netscape è?æ?¸é¡?å??"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "æ ¸è?æ©?é??å¯?ç¢¼å??è?å?¥ç¢¼"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ç?©ä»¶è?å?¥ç¢¼ (%s)"
 
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "æ¼?ç®?æ³?è?å?¥ç¢¼"
 
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "æ¼?ç®?æ³?å??æ?¸"
 
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "ä¸»æ?¨å?¬é??å¯?ç¢¼å??è³?è¨?"
 
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "ä¸»æ?¨å?¬é??å¯?ç¢¼å??æ¼?ç®?æ³?"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "ä¸»æ?¨ç??å?¬é??å¯?ç¢¼å??"
 
-#: ../smime/lib/e-cert.c:791
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "é?¯èª¤ï¼?ç?¡æ³?è??ç??å»¶ä¼¸"
 
-#: ../smime/lib/e-cert.c:812
-#: ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "ç?©ä»¶ç°½ç½²è??"
 
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "SSL è?æ?¸å?®ä½?"
 
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "é?»å?é?µä»¶å?®ä½?"
 
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "ç°½ç½²ä¸"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "ä¸?å?¯æ??çµ?"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "å¯?ç¢¼å??å? å¯?"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "è³?æ??å¯?ç¢¼"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "å¯?ç¢¼å??å??å??"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "è?æ?¸ç°½ç½²è??"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "CRL ç°½ç½²è??"
 
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "é??è¦?"
 
-#: ../smime/lib/e-cert.c:922
-#: ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "ä¸?é??è¦?"
 
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "å»¶ä¼¸"
 
-#: ../smime/lib/e-cert.c:1017
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072
-#: ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "è?æ?¸ç°½ç½²æ¼?ç®?æ³?"
 
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "ç?¼ç?§è??"
 
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "ç?¼ç?§è??ç?¨æ?? ID"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "ä¸»æ?¨ç?¨æ?? ID"
 
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "è?æ?¸ç°½ç½²å?¼"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "PKCS12 æª?æ¡?å¯?ç¢¼"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "è¼¸å?¥ PKCS12 æª?æ¡?ç??å¯?ç¢¼:"
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 msgstr "è¼¸å?¥ç??è?æ?¸"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: ../tools/killev.c:61
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "ç?¡æ³?å?·è¡? `%s'ï¼?%s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "é??é?? %s (%s)\n"
-
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "é??è¨?é??å±¬æ?§(_B)"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "æ?¹è®?é?¸å®?è³?æ??å¤¾ç??å±¬æ?§"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "è¤?è£½æ??æ??ç??è?¯çµ¡äººå?°(_P)..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "è?¯çµ¡äººé ?è¦½(_P)"
-
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "è¤?è£½"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "å°?é?¸å??ç??è?¯çµ¡äººè¤?è£½å?°å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:8
-msgid "Copy the contacts of the selected folder into another folder"
-msgstr "è¤?è£½å·²é?¸å®?è³?æ??å¤¾ä¸ç??è?¯çµ¡äººå?°å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:9
-#: ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "è¤?è£½é?¸å??ç??å?§å®¹"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "è¤?è£½è?³è³?æ??å¤¾..."
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new address book folder"
-msgstr "å»ºç«?æ?°é??è¨?é??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "å?ªä¸?"
-
-#: ../ui/evolution-addressbook.xml.h:13
-#: ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "å?ªä¸?é?¸å??ç¯?å??"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "å?ªé?¤é??è¨?é??(_E)"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "å?ªé?¤é?¸å®?ç??è?¯çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "å?ªé?¤é?¸å®?ç??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "è½?å¯?è?¯çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "å°?æ??æ??ç??è?¯çµ¡äººç§»å?°(_V)..."
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move selected contacts to another folder"
-msgstr "å°?é?¸å??ç??è?¯çµ¡äººç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:21
-msgid "Move the contacts of the selected folder into another folder"
-msgstr "å°?é?¸å®?è³?æ??å¤¾ä¸ç??è?¯çµ¡äººç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "ç§»è?³è³?æ??å¤¾..."
-
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "è²¼ä¸?"
-
-#: ../ui/evolution-addressbook.xml.h:24
-#: ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
-
-# zh_HK: msgstr "é ?è¦½å°?è¦?æ??å?°ç??é?£çµ¡äºº"
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "é ?è¦½å°?è¦?æ??å?°ç??é?£çµ¡äºº"
-
-# zh_HK: msgstr "æ??å?°é?¸å®?ç??é?£çµ¡äºº"
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "æ??å?°é?¸å®?ç??é?£çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "é??æ?°å?½å??é?¸å®?ç??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "å°?é??è¨?é??å?¦å?ç?º VC_ard"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "å?²å?ç?º VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "å°?é?¸å??ç??è?¯çµ¡äººå?²å?ç?º VCard"
-
-#: ../ui/evolution-addressbook.xml.h:33
-msgid "Save the contacts of the selected folder as VCard"
-msgstr "å°?é?¸å®?è³?æ??å¤¾ä¸ç??è?¯çµ¡äººå?²å?ç?º VCard"
-
-#: ../ui/evolution-addressbook.xml.h:34
-#: ../widgets/text/e-text.c:2719
-msgid "Select All"
-msgstr "å?¨é?¨é?¸å??"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "å?¨é?¨é?¸å??(_A)"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "é?¸æ??å?¨é?¨è?¯çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts"
-msgstr "å?³é??é?µä»¶è?³é?¸å??ç??è?¯çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person"
-msgstr "å?³é??é?¸å??è?¯çµ¡äººçµ¦å?¶ä»?ä½¿ç?¨è??ã??"
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "é¡¯ç¤ºè?¯çµ¡äººé ?è¦½è¦?çª?"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "å??æ¢(_O)"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "å??æ¢"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "å??æ¢è¼?å?¥"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "æª¢è¦?ç?®å??ç??è?¯çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:45
-#: ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "å??ä½?(_A)"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "è¤?è£½è?¯çµ¡äººå?°(_C)..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "è¤?è£½è³?æ??å¤¾è?¯çµ¡äººå?°(_C)"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "å?ªé?¤è?¯çµ¡äºº(_D)"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "è½?å¯?è?¯çµ¡äºº(_F)..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "å°?è?¯çµ¡äººç§»å?°(_M)..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "å°?è³?æ??å¤¾è?¯çµ¡äººç§»å?°(_M)"
-
-#: ../ui/evolution-addressbook.xml.h:55
-#: ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "æ?°å¢?(_N)"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "é??æ?°å?½å??(_R)"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "å°?è?¯çµ¡äººå?²å?ç?º VCar_d..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "å°?è³?æ??å¤¾è?¯çµ¡äººå?²å?ç?º VCar_d"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "å¤©"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "å?ªé?¤å?¨é?¨é?±æ??(_A)"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "å?ªé?¤å?¨é?¨é?±æ??"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "å?ªé?¤é??å??ç´?æ??"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "å?ªé?¤æ¤é?±æ??"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "ç§»è?³"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "å??å¾?"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "å??å??"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "æ¸?å?®"
-
-#: ../ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "æ??"
-
-#: ../ui/evolution-calendar.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:193
-msgid "Next"
-msgstr "ä¸?ä¸?å??"
-
-# zh_HK: msgstr "é ?è¦½å°?è¦?æ??å?°ç??è¡?äº?æ??å?§å®¹"
-#: ../ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "é ?è¦½å°?è¦?æ??å?°ç??è¡?äº?æ??å?§å®¹"
-
-#: ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:70
-#: ../widgets/misc/e-calendar.c:169
-msgid "Previous"
-msgstr "ä¸?ä¸?å??"
-
-# zh_HK: msgstr "æ??å?°é??å??è¡?äº?æ??"
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "æ??å?°é??å??è¡?äº?æ??"
-
-#: ../ui/evolution-calendar.xml.h:23
-#: ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "æ¸?é?¤(_E)"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "å?ªé?¤è??ç´?æ??å??æ??è°"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "é?¸æ??æ?¥æ??(_D)"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "é?¸æ??ä»?å¤©(_T)"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "é?¸å??ç?¹å®?æ?¥æ??"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "é?¸å??ä»?æ?¥"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "é¡¯ç¤ºæ??æ¸?å?®"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "é¡¯ç¤ºä¸?å¤©"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "é¡¯ç¤ºä¸?å??æ??"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "é¡¯ç¤ºä¸?é?±"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "é¡¯ç¤ºå·¥ä½?é?±"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "æª¢è¦?ç?®å??ç??ç´?æ??"
-
-#: ../ui/evolution-calendar.xml.h:36
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "æª¢è¦?ç´?é??æª?è¨?æ?¯ç??é?¤é?¯ä¸»æ?§å?°"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "é?±"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "å·¥ä½?é?±"
-
-#: ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "é?¤é?¯ç´?é??æª?(_D)"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "é??å??ç´?æ??(_O)"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "å??æ¶?ç?®å??é?µä»¶æ??ä½?ç??è¡?å??"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "è¤?è£½å·²é?¸å®?ç??è³?æ??å¤¾å?°å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "å»ºç«?ä¸?å??æ?°è³?æ??å¤¾ä»¥å?²å?é?µä»¶"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "å»ºç«?æ??ç·¨è¼¯æ??å°?è³?æ??å¤¾ç??å®?ç¾©"
-
-#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit rules for filtering new mail"
-msgstr "ç?ºæ?°é?µä»¶å»ºç«?æ??ç·¨è¼¯é??æ¿¾è¦?å??"
-
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages of accounts/folders marked for offline"
-msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??å¸³è??/è³?æ??å¤¾ä¹?é?µä»¶"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "æ¸?ç??å??æ?¶ç?(_T)"
-
-#: ../ui/evolution-mail-global.xml.h:9
-#: ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "è³?æ??å¤¾(_O)"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Move the selected folder into another folder"
-msgstr "å°?é?¸å®?ç??è³?æ??å¤¾ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:12
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "æ°¸ä¹?ç§»é?¤å?¨æ??æ??è³?æ??å¤¾å?§ç??å?¨é?¨å·²å?ªé?¤ç??é?µä»¶"
-
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Search F_olders"
-msgstr "æ??å°?è³?æ??å¤¾(_O)"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½(_P)"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "å?¨é?µä»¶æ¸?å?®ä¸?æ?¹é¡¯ç¤ºé?µä»¶é ?è¦½"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "å?¨é?µä»¶æ¸?å?®æ??é¡¯ç¤ºé?µä»¶é ?è¦½"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½è¦?çª?"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "è¨?é?±æ??å??æ¶?è¨?é?±å?¨é? ç«¯ä¼ºæ??å?¨ç??è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "å?³çµ±æª¢è¦?(_C)"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "è¤?è£½è³?æ??å¤¾å?°(_C)..."
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "ä¸?è¼?é?¢ç·?ä½¿ç?¨ç??é?µä»¶(_D)"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "é?µä»¶è¦?å??(_M)"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "ç§»å??è³?æ??å¤¾å?°(_M)..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "æ?°å¢?(_N)..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "é ?è¦½(_P)"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "è¨?é?±(_S)..."
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "å??ç?´æª¢è¦?(_V)"
-
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Change the name of this folder"
-msgstr "æ?´æ?¹é??å??è³?æ??å¤¾ç??å??ç¨±"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "æ?´æ?¹é??å??è³?æ??å¤¾ç??å±¬æ?§"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "æ?¶æ?ºæ??æ??ç?¸é??é?µä»¶(_T)"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "æ?¶æ?ºæ??æ??ç??ç?¸é??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?ªè²¼ç°¿"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "å°?é?µä»¶å?ªä¸?ä¸¦è²¼å?°å?ªè²¼ç°¿"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "å±?é??æ??æ??ç?¸é??é?µä»¶(_X)"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "å?ªé?¤(_X)"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "å±?é??æ??æ??ç??ç?¸é??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "é?±è??é?¸æ??ç??é?µä»¶(_E)"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "é?±è??å·²å?ªé?¤é?µä»¶(_D)"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "é?±è??å·²é?±è®?ç??é?µä»¶(_R)"
-
-#: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??ä»¥å?ªé?¤ç·?ç??å½¢å¼?é¡¯ç¤º"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "æ¨?ç¤ºæ??æ??é?µä»¶ç?ºå·²é?±è®?(_K)"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "å°?è³?æ??å¤¾ä¸å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "è?ªå?ªè²¼ç°¿è²¼ä¸?é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "æ°¸ä¹?ç§»é?¤å?¨é??å??è³?æ??å¤¾å?§å·²å?ªé?¤ç??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "æ°¸ä¹?ç§»é?¤é??å??è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "é??æ?°è¼?å?¥è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "é?¸æ??é?µä»¶å?ç¾£çµ?(_U)"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "é?¸æ??é?µä»¶æª?é (_T)"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "é?¸æ??å?¨é?¨ç??é?µä»¶(_A)"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr "é?¸æ??å?¨é?¨ç?®å??æ?ªé?¸å®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr "é?¸æ??æ??æ??ç?¸é??ç??é?µä»¶ç?ºé?¸å®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "é?¸æ??æ??æ??å??è¦?é?¸å®?é?µä»¶ç??ä¿¡"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "é¡¯ç¤ºé?±è??ç??é?µä»¶(_N)"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "é¡¯ç¤ºæ?«æ??é?±è??ç??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "å°?å·²é?±è®?ç??é?µä»¶æ?«æ??é?±è??"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ?«æ??é?±è??"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "ç?¸é??é?µä»¶æ¸?å?®"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "æ ¹æ??ç?¸é??é?µä»¶ç?ºç¾£çµ?(_G)"
-
-#: ../ui/evolution-mail-list.xml.h:37
-#: ../ui/evolution-mail-message.xml.h:111
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "é?µä»¶(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "å? å?¥å¯?ä»¶è??å?°ç?®é??æ??å??(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "å¥?ç?¨é??æ¿¾å?¨(_P)"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "æ?°å¢?å¯?ä»¶è??è?³é??è¨?é??"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "æ??æ??é?µä»¶æª?é (_H)"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "å¥?ç?¨é??æ¿¾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "æª¢æ?¥å??å?¾é?µä»¶(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "æ?°å¯«æ?°é?µä»¶(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?ä»¶è??"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?ªè²¼ç°¿"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "å»ºç«?è¦?å??(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨è¦?å??"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?é??æ¿¾å?¨è¦?å??"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "å°?é?µä»¶å?ªä¸?ä¸¦è²¼å?°å?ªè²¼ç°¿"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "å°?æ??å?ç¸®å°?"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?ç?¸é??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "è½?å¯?ç?º(_O)..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "é??ä¿¡è«?å£?é??æ¿¾å?¨(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "å¯?ä»¶è??é??æ¿¾å?¨(_N)..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_R)..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "ä¸»æ?¨é??æ¿¾å?¨(_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "ç¯©é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ¨?å¹?"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "è·?é?¨(_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??ä¸"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?çµ¦æ??äºº"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??å? æª?æ¡?å½¢å¼?è½?å¯?çµ¦æ??äºº"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "å°?æ??å?æ?¾å¤§"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "æ¨?ç¤ºæ??(_K)"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å·²ç¶?é?±è®?"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??é??è¦?"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å??å?¾é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "å°?é?¸å??ç??é?µä»¶æ¨?ç¤ºæ??ä¸?æ?¯å??å?¾é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??æ?ªé?±è®?"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??ä¸?é??è¦?"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??è¦?å?ªé?¤"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "ä¸?æ?¯å??å?¾é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "é??å??è¦?çª?ä»¥ä¾¿æ?°å¯«é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "ä½¿ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "è?ªå?ªè²¼ç°¿è²¼ä¸?é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pr_evious Important Message"
-msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
-
-# zh_HK: msgstr "é ?è¦½é??è¦?æ??å?°ç??é?µä»¶"
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Preview the message to be printed"
-msgstr "é ?è¦½é??è¦?æ??å?°ç??é?µä»¶"
-
-# zh_HK: msgstr "æ??å?°é?µä»¶"
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Print this message"
-msgstr "æ??å?°é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:74
-msgid "Re_direct"
-msgstr "é??æ?°å°?å??(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:75
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??çµ¦æ??äºº"
-
-#: ../ui/evolution-mail-message.xml.h:80
-msgid "Reset the text to its original size"
-msgstr "é??è¨æ??å?ç?ºå??å§?å¤§å°?"
-
-#: ../ui/evolution-mail-message.xml.h:81
-msgid "Save the selected messages as a text file"
-msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å?æ??æ??å?æª?æ¡?"
-
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Search Folder from Mailing _List..."
-msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??å¤¾(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Search Folder from Recipien_ts..."
-msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??å¤¾(_T)..."
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Search Folder from S_ubject..."
-msgstr "ä¸»æ?¨æ??å°?è³?æ??å¤¾(_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Search Folder from Sen_der..."
-msgstr "å¯?ä»¶è??æ??å°?è³?æ??å¤¾(_D)..."
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search for text in the body of the displayed message"
-msgstr "æ??å°?é¡¯ç¤ºç??é?µä»¶æ?¬æ??ä¸ç??æ??å?"
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Select _All Text"
-msgstr "é?¸å??æ??æ??æ??å?(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Select all the text in a message"
-msgstr "é?¸æ??é?µä»¶ä¸ç??æ??æ??æ??å?"
-
-#: ../ui/evolution-mail-message.xml.h:89
-#: ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "è¨å®?ä½ ç?®å??æ??å?°æ©?ç??ç??é?¢è¨å®?"
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??ä¸é¡¯ç¤ºé??ç??æ¸¸æ¨?"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Show messages with all email headers"
-msgstr "é¡¯ç¤ºé?µä»¶å??è©³ç´°æª?é "
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Show the raw email source of the message"
-msgstr "é¡¯ç¤ºé?µä»¶å??å§?æª?"
-
-#: ../ui/evolution-mail-message.xml.h:93
-msgid "Undelete the selected messages"
-msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Uni_mportant"
-msgstr "ä¸?é??è¦?(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Zoom _Out"
-msgstr "æ??é? (_O)"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "_Attached"
-msgstr "é??ä»¶(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "_Caret Mode"
-msgstr "æ¼?å?æ¨¡å¼?(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "_Clear Flag"
-msgstr "æ¸?é?¤æ¨?å¹?(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Delete Message"
-msgstr "å?ªé?¤é?µä»¶(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Find in Message..."
-msgstr "å?¨é?µä»¶å?§å°?æ?¾(_F)..."
-
-#: ../ui/evolution-mail-message.xml.h:104
-msgid "_Flag Completed"
-msgstr "æ¨?å¹?å·²å®?æ??(_F)"
-
-#: ../ui/evolution-mail-message.xml.h:106
-msgid "_Go To"
-msgstr "ç§»è?³(_G)"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Important"
-msgstr "é??è¦?(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Inline"
-msgstr "è¡?å?§(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Junk"
-msgstr "å??å?¾é?µä»¶(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Load Images"
-msgstr "è¼?å?¥å??ç??(_L)"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Message Source"
-msgstr "é?µä»¶ä¾?æº?(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Next Message"
-msgstr "ä¸?ä¸?å°?é?µä»¶(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:115
-msgid "_Normal Size"
-msgstr "æ£å¸¸å¤§å°?(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Not Junk"
-msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Open in New Window"
-msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Previous Message"
-msgstr "ä¸?ä¸?å°?é?µä»¶(_P)"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Quoted"
-msgstr "å¼?æ??(_Q)"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Read"
-msgstr "å·²é?±è®?(_R)"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Save Message..."
-msgstr "å?²å?é?µä»¶(_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Undelete Message"
-msgstr "å¾©å??å?ªé?¤é?µä»¶(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Unread"
-msgstr "æ?ªé?±è®?(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:127
-msgid "_Zoom"
-msgstr "ç¸®æ?¾(_Z)"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Zoom In"
-msgstr "æ??è¿?(_Z)"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "é??é??"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3
-#: ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "ä¸»å·¥å?·å??"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "è¤?è£½é?¸å®?ç??å??å¿?é??"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "å?ªä¸?é?¸å®?ç??å??å¿?é??"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
-
-# zh_HK: msgstr "é ?è¦½å°?è¦?æ??å?°ç??å??å¿?é??æ¸?å?®"
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "é ?è¦½å°?è¦?æ??å?°ç??å??å¿?é??æ¸?å?®"
-
-# zh_HK: msgstr "æ??å?°å??å¿?é??æ¸?å?®"
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "æ??å?°å??å¿?é??æ¸?å?®"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "æª¢è¦?é?¸å??ç??å??å¿?é??"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "é??å??å??å¿?é??(_O)"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "è¤?è£½é?¸å®?ç??å·¥ä½?"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "å?ªä¸?é?¸å®?ç??å·¥ä½?"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "å?ªé?¤å·²å®?æ??ç??å·¥ä½?"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "æ¨?ç¤ºç?ºå®?æ??(_K)"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?ç¤ºæ??å®?æ??"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-msgstr "è²¼ä¸?å?ªè²¼ç°¿ä¸?ç??å·¥ä½?"
-
-# zh_HK: msgstr "é ?è¦½å°?è¦?æ??å?°ç??å·¥ä½?æ¸?å?®"
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-msgstr "é ?è¦½å°?è¦?æ??å?°ç??å·¥ä½?æ¸?å?®"
-
-# zh_HK: msgstr "æ??å?°å·¥ä½?æ¸?å?®"
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "æ??å?°å·¥ä½?æ¸?å?®"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "é¡¯ç¤ºè?¯çµ¡äººé ?è¦½è¦?çª?"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "å·¥ä½?é ?è¦½(_P)"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "æª¢è¦?é?¸å??ç??å·¥ä½?"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "é??å??å·¥ä½?(_O)"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "é??æ?¼ Evolution..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "æ?¹è®? Evolution ç??è¨å®?å?¼"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "æ?´æ?¹å·¥å?·å??ç??å?¯è¦?æ?§"
-
-#: ../ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
-msgstr "å»ºç«?ä¸?å??æ?°ç??è¦?çª?ä¾?é¡¯ç¤ºé??å??è³?æ??å¤¾"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr "ä½¿ç?¨æ¡?é?¢å·¥å?·å??è¨å®?å?¼é¡¯ç¤ºè¦?çª?æ??é??"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "é¡¯ç¤ºè¦?çª?æ??é??ç??å??ç¤ºå??æ??å?"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??å??ç¤º"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??æ??å?"
-
-#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "é?¢é??é??å??ç¨?å¼?"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "å?ªé?¤å·²è¨?é??ç??å¯?ç¢¼ä»¥ä¾¿å?¯å??é??æ?°è¼¸å?¥"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "é?±è??è¦?çª?æ??é??"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "å?¯å?¥(_M)..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "å??ç¤ºå??æ??å?(_A)"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "å?¯å?¥å?¶ä»?ç¨?å¼?ç??è³?æ??"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "ä½?å±?(_O)"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "é??æ?°è¦?çª?(_W)"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "é??å??å¸¸è¦?å??é¡?(FAQ)ç¶²é ?"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "é ?é?¢è¨å®?(_U)..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "å??å¥½è¨å®?(_N)"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "å?³é??/æ?¥æ?¶"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "å?³é??/æ?¥æ?¶(_R)"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "å?³é??å¾?é??ç??é ?ç?®ä¸¦æ?¥æ?¶æ?°ç??é ?ç?®"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "è¨å®? Pilot çµ?æ??"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "é¡¯ç¤ºå?´é??æ¬?(_B)"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "é¡¯ç¤ºç??æ??å??(_S)"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "é¡¯ç¤ºå·¥å?·å??(_T)"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "é¡¯ç¤º Evolution ç?¸é??è³?è¨?"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "å?³é??é?¯èª¤å ±å??"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "å?³é??é?¯èª¤å ±å??(_B)"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "ä½¿ç?¨ Bug Buddy é??å?ºé?¯èª¤å ±å??ã??"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "å??æ??é?¢ç·?/å?¨ç·?å·¥ä½?ç??ç??æ??ã??"
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "å·¥å?·å??é¢¨æ ¼(_B)"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "é¡¯ç¤º/é?±è??å?´é??å??"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "é¡¯ç¤º/é?±è??ç??æ??å??"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "é?¢ç·?å·¥ä½?(_O)"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "é??æ?¼(_A)"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "é??é??è¦?çª?(_C)"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "é?ºå¿?å¯?ç¢¼(_F)"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "å¸¸è¦?å??é¡?(_F)"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "é?±è??æ??é??(_H)"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "å?ªæ??å??ç¤º(_I)"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "å¿«é??å??å¥½è¨å®?(_Q)"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "çµ?æ??(_Q)"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "å??æ??å¤?è§?(_S)"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "å??æ¥å??é?¸é ?(_S)..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "å?ªæ??æ??å?(_T)"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "è¦?çª?(_O)"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "æ ¹æ??å?¬å?¸(_C)"
@@ -21067,8 +20311,7 @@ msgstr "æ ¹æ??å?¬å?¸(_C)"
 msgid "_Address Cards"
 msgstr "å?°å??å?¡(_A)"
 
-#: ../views/addressbook/galview.xml.h:3
-#: ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "æ¸?å?®æª¢è¦?(_L)"
 
@@ -21133,62 +20376,61 @@ 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:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
+#: ../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
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>æ??å??</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>é?¸æ??(_S)</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "é?¸æ??ä¸?å??æ??å??"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "æ??å??"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
 msgstr "æ??å??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "ä½¿ç?¨æ»?é¼ å·¦é?µæ??è¿?å?°å??ç??å??å??ï¼?ç?¶å¾?é?¸å??æ??å??ã??\n"
 "ä½¿ç?¨æ»?é¼ å?³é?µæ??é? ã??"
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+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:356
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../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:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:337
 msgid "Define Views"
 msgstr "å®?ç¾©æª¢è¦?"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "å®?ç¾©ã??%sã??ç??æª¢è¦?"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "è¡¨æ ¼"
 
@@ -21196,132 +20438,58 @@ msgstr "è¡¨æ ¼"
 msgid "Instance"
 msgstr "å¯¦é«?"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "å?²å?ç?®å??æª¢è¦?"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "å»ºç«?æ?°ç??æª¢è¦?(_C)"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "ç½®æ??ç?¾å?ç??æª¢è¦?(_R)"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:580
-#: ../widgets/menus/gal-view-menus.c:365
-msgid "Custom View"
-msgstr "è?ªé?¸æª¢è¦?"
-
-#: ../widgets/menus/gal-view-instance.c:581
-msgid "Save Custom View"
-msgstr "å?²å?è?ªé?¸æª¢è¦?"
-
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:388
-msgid "Define Views..."
-msgstr "å®?ç¾©æª¢è¦?..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "ç?®å??æª¢è¦?(_U)"
-
-#: ../widgets/menus/gal-view-menus.c:327
-#, c-format
-msgid "Select View: %s"
-msgstr "é?¸æ??æª¢è¦?ï¼?%s"
-
-#: ../widgets/menus/gal-view-menus.c:370
-msgid "Current view is a customized view"
-msgstr "ç?®å??ç??æª¢è¦?æ?¹å¼?æ?¯è?ªé?¸ç??æª¢è¦?"
-
-#: ../widgets/menus/gal-view-menus.c:374
-msgid "Save Custom View..."
-msgstr "å?²å?è?ªé?¸æª¢è¦?..."
-
-#: ../widgets/menus/gal-view-menus.c:379
-msgid "Save current custom view"
-msgstr "å?²å?ç?®å??ç??è?ªé?¸æª¢è¦?"
-
-#: ../widgets/menus/gal-view-menus.c:393
-msgid "Create or edit views"
-msgstr "å»ºç«?æ??ç·¨è¼¯æª¢è¦?(_C)"
-
-#: ../widgets/menus/gal-view-new-dialog.c:68
+#: ../widgets/menus/gal-view-new-dialog.c:67
 msgid "Factory"
 msgstr "å·¥å» "
 
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "å®?ç¾©æ?°ç??æª¢è¦?"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "æ?°æª¢è¦?ç??å??ç¨±:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "æª¢è¦?ç??é¡?å??"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "æª¢è¦?ç??é¡?å??:"
 
-#: ../widgets/misc/e-attachment.c:990
-msgid "Attached message"
-msgstr "é??å? ç??é?µä»¶"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1773
-#: ../widgets/misc/e-attachment.c:2313
-#: ../widgets/misc/e-attachment-store.c:636
-msgid "attachment.dat"
-msgstr "attachment.dat"
-
-#: ../widgets/misc/e-attachment.c:1822
-#: ../widgets/misc/e-attachment.c:2619
-msgid "A load operation is already in progress"
-msgstr "è¼?å?¥æ??ä½?å·²å?¨é?²è¡?ä¸"
-
-#: ../widgets/misc/e-attachment.c:1830
-#: ../widgets/misc/e-attachment.c:2627
-msgid "A save operation is already in progress"
-msgstr "å?²å?æ??ä½?å·²å?¨é?²è¡?ä¸"
-
-#: ../widgets/misc/e-attachment.c:1923
-#, c-format
-msgid "Could not load '%s'"
-msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
-
-#: ../widgets/misc/e-attachment.c:1926
-#, c-format
-msgid "Could not load the attachment"
-msgstr "ç?¡æ³?è¼?å?¥é??ä»¶"
-
-#: ../widgets/misc/e-attachment.c:2190
-#, c-format
-msgid "Could not open '%s'"
-msgstr "ç?¡æ³?é??å??ã??%sã??"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "é ?è¨å?¼(_F)"
 
-#: ../widgets/misc/e-attachment.c:2193
-#, c-format
-msgid "Could not open the attachment"
-msgstr "ç?¡æ³?é??å??é??ä»¶"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "å¸³è??å??ç¨±"
 
-#: ../widgets/misc/e-attachment.c:2635
-msgid "Attachment contents not loaded"
-msgstr "ç?¡æ³?è¼?å?¥é??ä»¶å?§å®¹"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "é??è¨?å??å®?"
 
-#: ../widgets/misc/e-attachment.c:2712
-#, c-format
-msgid "Could not save '%s'"
-msgstr "ç?¡æ³?å?²å?ã??%sã??"
+#: ../widgets/misc/e-action-combo-box.c:388
+msgid "Action"
+msgstr "å??ä½?"
 
-#: ../widgets/misc/e-attachment.c:2715
-#, c-format
-msgid "Could not save the attachment"
-msgstr "ç?¡æ³?å?²å?é??ä»¶"
+#: ../widgets/misc/e-action-combo-box.c:389
+#, fuzzy
+msgid "A GtkRadioAction"
+msgstr "GtkRadioAction"
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
@@ -21335,10 +20503,19 @@ msgstr "æª?æ¡?å??ç¨±(_F):"
 msgid "MIME Type:"
 msgstr "MIME é¡?å??ï¼?"
 
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "å»ºè°è?ªå??é¡¯ç¤ºé??ä»¶(_S)"
+
 #: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "ç?¡æ³?è¨ç?ºè??æ?¯"
 
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "è¨ç?ºè??æ?¯(_B)"
+
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
@@ -21364,28 +20541,37 @@ msgid "Saving"
 msgstr "å?²å?ä¸"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
-msgstr "é?±è??é??å? æª?æ¡?å??(_A)"
+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:626
 msgid "Show _Attachment Bar"
-msgstr "é¡¯ç¤ºé??å? æª?æ¡?å??(_A)"
+msgstr "é¡¯ç¤ºé??ä»¶å??(_A)"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "å? å?¥é??ä»¶"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "A_ttach"
 msgstr "é??å? (_T)"
 
-#: ../widgets/misc/e-attachment-store.c:607
+#: ../widgets/misc/e-attachment-store.c:604
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "å?²å?é??ä»¶"
 msgstr[1] "å?²å?é??ä»¶"
 
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2317
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
 #: ../widgets/misc/e-attachment-view.c:300
 msgid "S_ave All"
 msgstr "å?²å?å?¨é?¨(_A)"
@@ -21394,6 +20580,14 @@ msgstr "å?²å?å?¨é?¨(_A)"
 msgid "A_dd Attachment..."
 msgstr "å? å?¥é??ä»¶(_A)..."
 
+#: ../widgets/misc/e-attachment-view.c:350
+msgid "_Hide"
+msgstr "é?±è??(_H)"
+
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "æª¢è¦?è¡?å?§(_V)"
+
 #: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open with \"%s\""
@@ -21404,8 +20598,63 @@ msgstr "ä»¥ã??%sã??é??å??"
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s ä¸é??å??é??å??é??ä»¶"
 
+#. To Translators: This text is set as a description of an attached message,
+#. when, for example, attaching it to a composer. When the message to be
+#. attached has also filled Subject, then this text is of form
+#. "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:1002
+msgid "Attached message"
+msgstr "é??å? ç??é?µä»¶"
+
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "è¼?å?¥æ??ä½?å·²å?¨é?²è¡?ä¸"
+
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "å?²å?æ??ä½?å·²å?¨é?²è¡?ä¸"
+
+#: ../widgets/misc/e-attachment.c:1920
+#, c-format
+msgid "Could not load '%s'"
+msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load the attachment"
+msgstr "ç?¡æ³?è¼?å?¥é??ä»¶"
+
+#: ../widgets/misc/e-attachment.c:2197
+#, c-format
+msgid "Could not open '%s'"
+msgstr "ç?¡æ³?é??å??ã??%sã??"
+
+#: ../widgets/misc/e-attachment.c:2200
+#, c-format
+msgid "Could not open the attachment"
+msgstr "ç?¡æ³?é??å??é??ä»¶"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "ç?¡æ³?è¼?å?¥é??ä»¶å?§å®¹"
+
+#: ../widgets/misc/e-attachment.c:2711
+#, c-format
+msgid "Could not save '%s'"
+msgstr "ç?¡æ³?å?²å?ã??%sã??"
+
+#: ../widgets/misc/e-attachment.c:2714
+#, c-format
+msgid "Could not save the attachment"
+msgstr "ç?¡æ³?å?²å?é??ä»¶"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../widgets/misc/e-buffer-tagger.c:359
+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:1253
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%Y å¹´ %-m æ??"
 
@@ -21413,361 +20662,329 @@ msgstr "%Y å¹´ %-m æ??"
 msgid "Month Calendar"
 msgstr "æ??è¡?äº?æ??"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455
-#: ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3387
+#: ../widgets/text/e-text.c:3388
 msgid "Fill color"
 msgstr "å¡«å?¥è?²å½©"
 
-#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:462
-#: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469
-#: ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640
-#: ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482 ../widgets/text/e-text.c:3394
+#: ../widgets/text/e-text.c:3395 ../widgets/text/e-text.c:3401
+#: ../widgets/text/e-text.c:3402
 msgid "GDK fill color"
 msgstr "GDK å¡«è?²"
 
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476
-#: ../widgets/text/e-text.c:3653
-#: ../widgets/text/e-text.c:3654
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489 ../widgets/text/e-text.c:3408
+#: ../widgets/text/e-text.c:3409
 msgid "Fill stipple"
 msgstr "å¡«å?¥ç¶²é»?"
 
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
+#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:510
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
+#: ../widgets/misc/e-canvas-background.c:516
+#: ../widgets/misc/e-canvas-background.c:517
 msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/misc/e-reflow.c:1414
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-container.c:1009
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
+#: ../widgets/table/e-table-item.c:2872
 msgid "Minimum width"
 msgstr "æ??å°?é??åº¦"
 
 #: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/misc/e-reflow.c:1415
-#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1010
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:2873
 msgid "Minimum Width"
 msgstr "æ??å°?é??åº¦"
 
-#: ../widgets/misc/e-canvas-vbox.c:101
-#: ../widgets/misc/e-canvas-vbox.c:102
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "é??è·?"
 
-#: ../widgets/misc/e-cell-date-edit.c:296
-msgid "Now"
-msgstr "ç?¾å?¨"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "æ??é??å¿?é ?ç?ºæ¤æ ¼å¼?ï¼?%s"
-
-#: ../widgets/misc/e-cell-percent.c:76
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "æ?¸å?¼å¿?é ?æ?¯ç?± 0 å?° 100 ç??æ?¸å?"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "é?¿æ??ä¼¯æ??"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "æ³¢ç¾?ç??æµ·èª?ç³»"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "ä¸æ?èª?ç³»"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "ä¸æ??"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "æ?¯æ??å¤«èª?ç³»"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "å¸?è??æ??"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "å¸?ä¼¯ä¾?æ??"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "æ?¥æ??"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "é??æ??"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "æ³°æ??"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "å??è?³å?¶æ??"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "è?¬å??ç¢¼"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "è¥¿æ?èª?ç³»"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "è¥¿æ?èª?ç³»ï¼?æ?°"
-
-#: ../widgets/misc/e-charset-picker.c:89
-#: ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "ç¹?é«?"
-
-#: ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "ç°¡é«?"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "ç??å??è?èª?"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "è¦?è¦º"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "ä¸?æ??ç??å?ç¬¦é??ï¼?%s"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "å?ç¬¦ç·¨ç¢¼"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "è¼¸å?¥è¦?ä½¿ç?¨ç??å?ç¬¦é??"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "å?¶å®?..."
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "å?ç¬¦ç·¨ç¢¼(_A)"
-
-#: ../widgets/misc/e-dateedit.c:295
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "æ?¥æ??è??æ??å?»"
 
-#: ../widgets/misc/e-dateedit.c:315
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Text entry to input date"
 msgstr "ç?¨ä¾?è¼¸å?¥æ?¥æ??ç??æ??å?é ?ç?®"
 
-#: ../widgets/misc/e-dateedit.c:337
+#: ../widgets/misc/e-dateedit.c:566
 msgid "Click this button to show a calendar"
 msgstr "æ??æ¤æ??é??ä»¥é¡¯ç¤ºè¡?äº?æ??"
 
-#: ../widgets/misc/e-dateedit.c:379
+#: ../widgets/misc/e-dateedit.c:612
 msgid "Drop-down combination box to select time"
 msgstr "ç?¨ä»¥é?¸æ??æ??å?»ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/misc/e-dateedit.c:455
+#: ../widgets/misc/e-dateedit.c:684
 msgid "No_w"
 msgstr "ç?¾å?¨(_W)"
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:690
 msgid "_Today"
 msgstr "ä»?å¤©(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1583
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:698
+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:1935
+msgctxt "date"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../widgets/misc/e-dateedit.c:1830
 msgid "Invalid Date Value"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1613
+#: ../widgets/misc/e-dateedit.c:1874
 msgid "Invalid Time Value"
 msgstr "ç?¡æ??ç??æ??å?»æ?¸å?¼"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:123
-#: ../widgets/misc/e-filter-bar.c:178
-#: ../widgets/misc/e-filter-bar.c:306
-#: ../widgets/misc/e-filter-bar.c:737
-msgid "Advanced Search"
-msgstr "é?²é??æ??å°?"
+#: ../widgets/misc/e-import-assistant.c:238
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr "é?¸å??è¦?å?¯å?¥ Evolution ç??æª?æ¡?ï¼?ä¸¦ä¸?å?¨æ¸?å?®å?§é?¸å??æª?æ¡?é¡?å??ã??"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:229
-msgid "Save Search"
-msgstr "å?²å?æ??å°?çµ?æ??"
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "æª?æ¡?å??ç¨±(_I):"
 
-#: ../widgets/misc/e-filter-bar.c:266
-msgid "_Searches"
-msgstr "æ??å°?(_S)"
+#: ../widgets/misc/e-import-assistant.c:265
+msgid "Select a file"
+msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../widgets/misc/e-filter-bar.c:268
-msgid "Searches"
-msgstr "æ??å°?"
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
+msgid "File _type:"
+msgstr "æª?æ¡?é¡?å??(_T):"
 
-#: ../widgets/misc/e-filter-bar.h:100
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "_Save Search..."
-msgstr "å?²å?æ??å°?çµ?æ??(_S)..."
+#: ../widgets/misc/e-import-assistant.c:322
+msgid "Choose the destination for this import"
+msgstr "é?¸æ??æ¤è¼¸å?¥ç??ç?®ç??å?°"
 
-#: ../widgets/misc/e-filter-bar.h:101
-#: ../widgets/misc/e-filter-bar.h:111
-msgid "_Edit Saved Searches..."
-msgstr "ç·¨è¼¯å?²å?ç??æ??å°?çµ?æ??(_E)..."
+#: ../widgets/misc/e-import-assistant.c:347
+msgid "Choose the type of importer to run:"
+msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
 
-#: ../widgets/misc/e-filter-bar.h:102
-#: ../widgets/misc/e-filter-bar.h:112
-msgid "_Advanced Search..."
-msgstr "é?²é??æ??å°?(_A)..."
+#: ../widgets/misc/e-import-assistant.c:355
+msgid "Import data and settings from _older programs"
+msgstr "å¾?è??ç¨?å¼?è¼¸å?¥è³?æ??å??è¨å®?å?¼(_O)"
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "æ??æ??ç??å¸³è??"
+#: ../widgets/misc/e-import-assistant.c:363
+msgid "Import a _single file"
+msgstr "å?¯å?¥å?®ä¸?æª?æ¡?(_S)"
 
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "ç?®å??ç??å¸³è??"
+#: ../widgets/misc/e-import-assistant.c:439
+msgid "Select what type of file you want to import from the list."
+msgstr "é?¸æ??ä½ æ?³è¦?å¾?æ¸?å?®ä¸å?¯å?¥ç??æª?æ¡?é¡?å??ã??"
 
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "ç?®å??ç??è³?æ??å¤¾"
+#: ../widgets/misc/e-import-assistant.c:516
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr "Evolution å·²ç¶?æª¢æ?¥å¾?ä»¥ä¸?æ??ç?¨ç¨?å¼?è¼¸å?¥ç??è¨å®?å?¼ï¼?Pineã??Netscapeã??Elmã??iCalendarã??æ?¾ä¸?å?°å?¯ä»¥è¼¸å?¥ç??è¨å®?å?¼ã??å¦?æ??ä½ æ?³å??è©¦ä¸?æ¬¡ï¼?è«?æ??ä¸?ä¸?ã??å??å¾?ã??æ??é??ã??"
+
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
+msgid "Evolution Import Assistant"
+msgstr "Evolution å?¯å?¥å?©ç??"
+
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "è¼¸å?¥ä½?ç½®"
+
+#: ../widgets/misc/e-import-assistant.c:1207
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"æ¡è¿?ä½¿ç?¨ Evolution ç??å?¯å?¥å?©ç??ã??\n"
+"é??å??ç²¾é??å°?æ??é ?å°?ä½ å¦?ä½?å°?å¤?é?¨ç??æª?æ¡?å?¯å?¥å?° Evolutionã??"
+
+#: ../widgets/misc/e-import-assistant.c:1223
+msgid "Importer Type"
+msgstr "è¼¸å?¥å?¨é¡?å??"
+
+#: ../widgets/misc/e-import-assistant.c:1232
+msgid "Select Information to Import"
+msgstr "é?¸æ??è¦?å?¯å?¥ç??è³?è¨?"
+
+#: ../widgets/misc/e-import-assistant.c:1240
+msgid "Select a File"
+msgstr "é?¸å??æª?æ¡?"
 
-#: ../widgets/misc/e-image-chooser.c:168
-msgid "Choose Image"
-msgstr "é?¸æ??å??ç??"
+#: ../widgets/misc/e-import-assistant.c:1255
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "æ??ã??å¥?ç?¨ã??é??å§?å°?æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-map.c:605
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
+msgid "Import Data"
+msgstr "å?¯å?¥è³?æ??"
+
+#: ../widgets/misc/e-map.c:621
 msgid "World Map"
 msgstr "ä¸?ç??å?°å??"
 
-#: ../widgets/misc/e-map.c:607
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
+#: ../widgets/misc/e-map.c:623
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
 msgstr "ç?¨ä¾?é?¸æ??æ??å??ç??æ»?é¼ äº?å??å¼?å?°å??å??ä»¶ã??ä½¿ç?¨é?µç?¤ç??ä½¿ç?¨è??æ??è©²ä½¿ç?¨ä¸?æ?¹ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?ä¾?é?¸æ??æ??å??ã??"
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "ä¸?ç·?"
+# zh_HK: msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
+#: ../widgets/misc/e-online-button.c:27
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
+
+# zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+#: ../widgets/misc/e-online-button.c:30
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+
+# zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+#: ../widgets/misc/e-online-button.c:33
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
 
-#: ../widgets/misc/e-pilot-settings.c:99
+#: ../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:107
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "å??æ¥ç§?äººè¨?é??:"
 
-#: ../widgets/misc/e-pilot-settings.c:116
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "å??æ¥å??é¡?:"
 
-#: ../widgets/misc/e-reflow.c:1435
-#: ../widgets/misc/e-reflow.c:1436
-msgid "Empty message"
-msgstr "ç©ºç?½é?µä»¶"
-
-#: ../widgets/misc/e-reflow.c:1442
-#: ../widgets/misc/e-reflow.c:1443
-msgid "Reflow model"
-msgstr "å??æµ?æ¨¡å¼?"
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "Evolution å??å¥½è¨å®?"
 
-#: ../widgets/misc/e-reflow.c:1449
-#: ../widgets/misc/e-reflow.c:1450
-msgid "Column width"
-msgstr "æ¬?å¯¬"
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "ç¬¦å??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:92
-#: ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503
-#: ../widgets/misc/e-search-bar.c:505
-#: ../widgets/misc/e-search-bar.c:1021
-msgid "Search"
-msgstr "æ??å°?"
+#: ../widgets/misc/e-search-bar.c:554
+msgid "Close the find bar"
+msgstr "é??é??æ??å°?å·¥å?·å??"
 
-#: ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503
-#: ../widgets/misc/e-search-bar.c:505
-msgid "Click here to change the search type"
-msgstr "æ??é??è£?ä»¥æ?¹è®?æ??å°?é¡?å??"
+#: ../widgets/misc/e-search-bar.c:562
+msgid "Fin_d:"
+msgstr "å°?æ?¾(_D):"
 
-#: ../widgets/misc/e-search-bar.c:637
-msgid "_Search"
-msgstr "æ??å°?(_S)"
+#: ../widgets/misc/e-search-bar.c:574
+msgid "Clear the search"
+msgstr "æ¸?é?¤æ¤æ??å°?"
 
-#: ../widgets/misc/e-search-bar.c:643
-msgid "_Find Now"
-msgstr "ç«?å?³æ??å°?(_F)"
+#: ../widgets/misc/e-search-bar.c:597
+msgid "_Previous"
+msgstr "ä¸?ä¸?å??(_P)"
 
-#: ../widgets/misc/e-search-bar.c:644
-msgid "_Clear"
-msgstr "æ¸?é?¤(_C)"
+#: ../widgets/misc/e-search-bar.c:603
+msgid "Find the previous occurrence of the phrase"
+msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
 
-#: ../widgets/misc/e-search-bar.c:899
-msgid "Item ID"
-msgstr "é ?ç?® ID"
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Next"
+msgstr "ä¸?ä¸?å??(_N)"
 
-#: ../widgets/misc/e-search-bar.c:906
-#: ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
-msgid "Text"
-msgstr "æ??å?"
+#: ../widgets/misc/e-search-bar.c:619
+msgid "Find the next occurrence of the phrase"
+msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
 
-#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
-#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1053
-msgid "Sho_w: "
-msgstr "é¡¯ç¤º(_W):"
+#: ../widgets/misc/e-search-bar.c:629
+msgid "Mat_ch case"
+msgstr "å??å??å¤§å°?å¯«(_C)"
 
-#: ../widgets/misc/e-search-bar.c:1072
-msgid "Sear_ch: "
-msgstr "æ??å°?(_C):"
+#: ../widgets/misc/e-search-bar.c:657
+msgid "Reached bottom of page, continued from top"
+msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?ç«¯ç¹¼çº?"
 
-#. To Translators: The " in " label is part of the Quick Search Bar, example:
-#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1088
-msgid " i_n "
-msgstr " i_n "
+#: ../widgets/misc/e-search-bar.c:679
+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
@@ -21779,322 +20996,415 @@ msgstr "æ¸¸æ¨?å??"
 msgid "Cursor Column"
 msgstr "æ¸¸æ¨?æ¬?"
 
-#: ../widgets/misc/e-selection-model.c:208
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Sorter"
 msgstr "å??é¡?å?¨"
 
-#: ../widgets/misc/e-selection-model.c:215
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Selection Mode"
 msgstr "é?¸æ??å??æ¨¡å¼?"
 
-#: ../widgets/misc/e-selection-model.c:223
+#: ../widgets/misc/e-selection-model.c:231
 msgid "Cursor Mode"
 msgstr "æ¸¸æ¨?æ¨¡å¼?"
 
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "å?ªé?¤æ??(_L):"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>é??é??é?¸é ?</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>å??è¦?</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>è¿?å??é??ç?¥</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>ç??æ??è¿½è¹¤</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "è?ªå??å?ªé?¤é ?ç?®(_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "å»ºç«?æ?°ç??å?³é??é ?ç?®è?³è¿½è¹¤è³?è¨?(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "å·²é??é??è??å·²é??å??(_V)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr "é??é??é?¸é ?"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+#, fuzzy
+msgid "For Your Eyes Only"
+msgstr "å?ªå??è¨±ç¹«çµ?ç??è£?ç½®"
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "ä¸?è?¬é?¸é ?(_R)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
-msgstr ""
-"ç?¡\n"
-"è®?ä¿¡å??æ¢?"
+#: ../widgets/misc/e-send-options.ui.h:10
+msgid "Mail Receipt"
+msgstr "é?µä»¶å??æ¢?"
 
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"ä¸?è?¬\n"
-"ç§?æ??\n"
-"å¯?\n"
-"æ©?å¯?\n"
-"æ¥µæ©?å¯?\n"
-"å?ªæ??ä½ è?½ç??"
-
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../widgets/misc/e-send-options.ui.h:14
+msgid "Proprietary"
+msgstr "å°?å?©"
+
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "è¦?æ±?å??è¦?(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Return Notification"
+msgstr "è¿?å??é??ç?¥"
+
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
 msgstr "ç??æ??è¿½è¹¤(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"æ?ªå®?ç¾©\n"
-"é«?\n"
-"æ¨?æº?\n"
-"ä½?"
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Standard"
+msgstr "æ¨?æº?"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Status Tracking"
+msgstr "ç??æ??è¿½è¹¤"
+
+#: ../widgets/misc/e-send-options.ui.h:23
+#, fuzzy
+msgid "Top Secret"
+msgstr "é«?åº¦æ©?å¯?"
 
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
 msgstr "ç?¶æ?¥å??æ??(_P):"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When co_mpleted:"
 msgstr "ç?¶å®?æ??æ??(_M):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "When decli_ned:"
 msgstr "ç?¶æ??çµ?æ??(_N):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "Wi_thin"
 msgstr "æ?¼å?§(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_After:"
 msgstr "ä¹?å¾?(_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "_All information"
 msgstr "å?¨é?¨è³?è¨?(_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_Classification:"
 msgstr "æ¸é¡?(_C):"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delay message delivery"
 msgstr "å»¶é?²é?µä»¶é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delivered"
 msgstr "å·²é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Set expiration date"
 msgstr "è¨å®?é?¾æ??æ?¥æ??(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Until:"
 msgstr "å?®ä½?(_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "ç?¶æ??ç©ºæ??(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "ç?¶é??å??æ??(_W):"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:251
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../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
+msgid "Unnamed"
+msgstr "æ?ªå?½å??ç??"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:257
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% å®?æ??)"
+#: ../widgets/misc/e-signature-editor.c:210
+msgid "_Save and Close"
+msgstr "å?²å?å¾?é??é??(_S)"
+
+#: ../widgets/misc/e-signature-editor.c:389
+msgid "Edit Signature"
+msgstr "ç·¨è¼¯ç°½å??æª?"
+
+#: ../widgets/misc/e-signature-editor.c:404
+msgid "_Signature Name:"
+msgstr "ç°½å??æª?å??ç¨±(_S):"
+
+#: ../widgets/misc/e-signature-manager.c:294
+msgid "Add Signature Script"
+msgstr "æ?°å¢?ç°½ç½²å?½ä»¤ç¨¿"
+
+#: ../widgets/misc/e-signature-manager.c:359
+msgid "Edit Signature Script"
+msgstr "ç·¨è¼¯ç°½ç½²å?½ä»¤ç¨¿"
 
-#: ../widgets/misc/e-url-entry.c:103
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "æ?°å¢?å?½ä»¤ç¨¿(_S)"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"é??å??å?½ä»¤ç¨¿ç??è¼¸å?ºæ??ç?¨ä¾?ä½?ç?ºä½ ç??\n"
+"ç°½å??æª?ã??ä½ æ??å®?ç??å??ç¨±å?ªæ??ä½?ç?º\n"
+"é¡¯ç¤ºä¹?ç?¨ã??"
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+msgid "S_cript:"
+msgstr "å?½ä»¤ç¨¿(_C):"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+msgid "Script file must be executable."
+msgstr "å?½ä»¤ç¨¿å¿?é ?ç?ºå?¯å?·è¡?æª?ã??"
+
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "æ??é??è£?ä»¥ç§»è?³ URL"
 
+#: ../widgets/misc/e-web-view.c:348
+msgid "_Copy Link Location"
+msgstr "è¤?è£½é?£çµ?ä½?å??(_C)"
+
+#: ../widgets/misc/e-web-view.c:350
+msgid "Copy the link to the clipboard"
+msgstr "è¤?è£½é?£çµ?å?°å?ªè²¼è??"
+
+#: ../widgets/misc/e-web-view.c:358
+msgid "_Open Link in Browser"
+msgstr "å?¨ç??è¦½å?¨å?§é??å??é?£çµ?(_O)"
+
+#: ../widgets/misc/e-web-view.c:360
+msgid "Open the link in a web browser"
+msgstr "å?¨ç¶²é ?ç??è¦½å?¨ä¸é??å??æ¤é?£çµ?"
+
+#: ../widgets/misc/e-web-view.c:368
+msgid "_Copy Email Address"
+msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??(_C)"
+
+#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+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
+#, c-format
+msgid "Click to call %s"
+msgstr "æ??ä¸?ä¸?æ?è??çµ¦ %s"
+
+#: ../widgets/misc/e-web-view.c:758
+msgid "Click to hide/unhide addresses"
+msgstr "æ??é??è£?é?±è??/è§£é?¤é?±è??ä½?å??"
+
+#: ../widgets/misc/e-web-view.c:760
+#, c-format
+msgid "Click to open %s"
+msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
+
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
+msgid "%d %B %Y"
+msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
+
+#: ../widgets/misc/ea-calendar-item.c:311
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "è¡?äº?æ??ï¼?å¾? %s å?° %s"
+
+#: ../widgets/misc/ea-calendar-item.c:347
+msgid "evolution calendar item"
+msgstr "evolution è¡?äº?æ??é ?ç?®"
+
 #: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "å½?å?ºå¼?æ¸?å?®"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
+#: ../widgets/table/e-cell-date-edit.c:296
+msgid "Now"
+msgstr "ç?¾å?¨"
+
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:313
+msgctxt "table-date"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../widgets/table/e-cell-date-edit.c:321
+msgid "OK"
+msgstr "ç¢ºå®?"
+
+#: ../widgets/table/e-cell-date-edit.c:846
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "æ??é??å¿?é ?ç?ºæ¤æ ¼å¼?ï¼?%s"
+
+#: ../widgets/table/e-cell-percent.c:76
+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:367
+#: ../widgets/table/e-cell-pixbuf.c:364
 msgid "Focused Column"
 msgstr "è??ç?¦ç??æ¬?"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
+#: ../widgets/table/e-cell-pixbuf.c:371
 msgid "Unselected Column"
 msgstr "æ?ªé?¸æ??ç??æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1788
+#: ../widgets/table/e-cell-text.c:1627
 msgid "Strikeout Column"
 msgstr "å?ªé?¤ç·?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1795
+#: ../widgets/table/e-cell-text.c:1634
 msgid "Underline Column"
 msgstr "åº?ç·?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1641
 msgid "Bold Column"
 msgstr "ç²?é«?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1648
 msgid "Color Column"
 msgstr "è?²å½©æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1662
 msgid "BG Color Column"
 msgstr "è??æ?¯è?²å½©æ¬?"
 
-#: ../widgets/table/e-table-config.c:152
+#: ../widgets/table/e-table-click-to-add.c:582
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "è«?æ??é??è£?å? å?¥"
+
+#: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "ç??æ??"
 
-#: ../widgets/table/e-table-config.c:385
-#: ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(é??å¢?)"
 
-#: ../widgets/table/e-table-config.c:385
-#: ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(é??æ¸?)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "æ?ªæ??åº?"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "æ?ªçµ?æ??ç¾£çµ?"
 
-#: ../widgets/table/e-table-config.c:642
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "é¡¯ç¤ºæ¬?ä½?"
 
-#: ../widgets/table/e-table-config.c:663
+#: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
 msgstr "å?¯ç?¨ç??æ¬?ä½?"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨ç??æ¬?ä½?(_V):"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Ascending"
 msgstr "é??å¢?"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "å?¨é?¨æ¸?é?¤"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "å?¨é?¨æ¸?é?¤(_A)"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Descending"
 msgstr "é??æ¸?"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "å°?é ?ç?®çµ?æ??ç¾£çµ?ï¼?æ ¹æ??"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "ä¸?ç§»(_D)"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "ä¸?ç§»(_U)"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "é¡¯ç¤ºæª¢è¦?ä¸ç??æ¬?ä½?(_F)"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "é¡¯ç¤ºæª¢è¦?ä¸ç??æ¬?ä½?(_N)"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "é¡¯ç¤ºæª¢è¦?ä¸ç??æ¬?ä½?(_V)"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "æ??åº?"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "æ??åº?é ?ç?®æ ¹æ??"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "æ?¥ç??æ ¹æ??"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "æ¬?ä½?é¡¯ç¤º(_F)..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "ç¾£çµ?æ ¹æ??(_G)..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "é¡¯ç¤ºæª¢è¦?ä¸ç??æ¬?ä½?(_S)"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "æ ¹æ??åº?é¡¯ç¤ºé??äº?æ¬?ä½?(_S):"
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "æ??åº?(_S)..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "å? å?¥ä¸?æ¬?..."
+msgid "Add a Column"
+msgstr "å? å?¥ä¸?æ¬?"
 
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "æ¬?ä½?é?¸æ??ç¨?å¼?"
-
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22102,106 +21412,93 @@ msgstr ""
 "æ?³å?¨ä½ ç??è¡¨æ ¼ä¸å? å?¥æ¬?ä½?ï¼?å?ªè¦?å°?å®?\n"
 "æ??æ?³è?³ä½ å¸?æ??å®?å?ºç?¾ç??ä½?ç½®å?³å?¯ã??"
 
-#: ../widgets/table/e-table-group-container.c:341
+#: ../widgets/table/e-table-group-container.c:342
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d å??é ?ç?®)"
 msgstr[1] "%s : %s (%d å??é ?ç?®)"
 
-#: ../widgets/table/e-table-group-container.c:347
+#: ../widgets/table/e-table-group-container.c:348
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d å??é ?ç?®)"
 msgstr[1] "%s (%d å??é ?ç?®)"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
+#: ../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:3020
-#: ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:2830 ../widgets/table/e-table-item.c:2831
 msgid "Alternating Row Colors"
 msgstr "å??è??å??é??äº¤æ?¿ä½¿ç?¨ç??è?²å½©"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
+#: ../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:3027
-#: ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339
-#: ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
+#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
 msgid "Horizontal Draw Grid"
 msgstr "æ°´å¹³ç¹ªå??æ ¼"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
+#: ../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:3034
-#: ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345
-#: ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
+#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
 msgid "Vertical Draw Grid"
 msgstr "å??ç?´ç¹ªå??æ ¼"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
+#: ../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:3041
-#: ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351
-#: ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
+#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
 msgid "Draw focus"
 msgstr "ç¹ªå??ç?¦é»?"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
+#: ../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:3048
-#: ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:2858 ../widgets/table/e-table-item.c:2859
 msgid "Cursor mode"
 msgstr "æ¸¸æ¨?æ¨¡å¼?"
 
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
+#: ../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:3013
-#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:2823 ../widgets/table/e-table-item.c:2824
 msgid "Selection model"
 msgstr "é?¸æ??å??æ¨¡å??"
 
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
+#: ../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:3055
-#: ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3316
-#: ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-tree.c:3337
 msgid "Length Threshold"
 msgstr "ç??é??é?·åº¦"
 
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-container.c:974
+#: ../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:3089
-#: ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3323
-#: ../widgets/table/e-tree.c:3365
-#: ../widgets/table/e-tree.c:3366
+#: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
+#: ../widgets/table/e-table.c:3328 ../widgets/table/e-tree.c:3368
+#: ../widgets/table/e-tree.c:3369
 msgid "Uniform row height"
 msgstr "æ¨?æº?å??é«?"
 
-#: ../widgets/table/e-table-group-container.c:980
-#: ../widgets/table/e-table-group-container.c:981
+#: ../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"
@@ -22255,220 +21552,231 @@ msgstr "æ ¼å¼?å??æ¬?(_S)..."
 msgid "Custo_mize Current View..."
 msgstr "è?ªé?¸ç?®å??ç??æª¢è¦?(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1539
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1555
 msgid "_Custom"
 msgstr "è?ªé?¸(_C)"
 
-#: ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2809 ../widgets/table/e-table-item.c:2810
 msgid "Table header"
 msgstr "è¡¨æ ¼æ¨?é¡?"
 
-#: ../widgets/table/e-table-item.c:3006
-#: ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:2816 ../widgets/table/e-table-item.c:2817
 msgid "Table model"
 msgstr "è¡¨æ ¼æ¨¡å??"
 
-#: ../widgets/table/e-table-item.c:3082
-#: ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:2892 ../widgets/table/e-table-item.c:2893
 msgid "Cursor row"
 msgstr "æ¸¸æ¨?å??"
 
-#: ../widgets/table/e-table-sorter.c:172
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "æ??åº?è³?è¨?"
 
-#: ../widgets/table/e-table.c:3330
-#: ../widgets/table/e-tree.c:3372
-#: ../widgets/table/e-tree.c:3373
+#: ../widgets/table/e-table.c:3335 ../widgets/table/e-tree.c:3375
+#: ../widgets/table/e-tree.c:3376
 msgid "Always search"
 msgstr "ç¸½æ?¯æ??å°?"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3342
 msgid "Use click to add"
 msgstr "è«?æ??é??è£?å? å?¥"
 
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "æ¨¹ç??"
+#: ../widgets/table/e-table.c:3356
+msgid "Vertical Row Spacing"
+msgstr "å??ç?´æ¬?é??è·?"
 
-#: ../widgets/table/e-tree.c:3358
-#: ../widgets/table/e-tree.c:3359
+#: ../widgets/table/e-table.c:3357
+msgid "Vertical space between rows. It is added to top and to bottom of a row"
+msgstr "å??å??ä¹?é??ç??å??ç?´é??è·?ã??å®?æ??å? å?¥å?°æ¯?å??ç??é ?ç«¯å??åº?é?¨"
+
+#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
 msgid "ETree table adapter"
 msgstr "ETree è¡¨æ ¼æ©?æ?¥å?¨"
 
-#: ../widgets/table/e-tree.c:3379
+#: ../widgets/table/e-tree.c:3382
 msgid "Retro Look"
 msgstr "æ?·è??å¤?è§?"
 
-#: ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-tree.c:3383
 msgid "Draw lines and +/- expanders."
 msgstr "ç¹ªå?ºç·?æ¢?è?? +/- å±?é??ç¬¦è??ã??"
 
-#: ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-tree.c:3389
 msgid "Expander Size"
 msgstr "å±?é??å?¨å¤§å°?"
 
-#: ../widgets/table/e-tree.c:3387
+#: ../widgets/table/e-tree.c:3390
 msgid "Size of the expander arrow"
 msgstr "å±?é??å?¨ç®è??ç??å¤§å°?"
 
-#: ../widgets/text/e-text.c:2731
+#: ../widgets/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "å½?å?º"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+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
+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
+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
+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
+msgid "collapses the row in the ETree containing this cell"
+msgstr "æ??ç?? ETree ä¸å??å?«æ¤å?²å?æ ¼ç??å??"
+
+#: ../widgets/table/gal-a11y-e-cell.c:119
+msgid "Table Cell"
+msgstr "è¡¨æ ¼ç??å?²å?æ ¼"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "é»?é?¸"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+msgid "sort"
+msgstr "æ??åº?"
+
+#: ../widgets/text/e-text.c:2474
+msgid "Select All"
+msgstr "å?¨é?¨é?¸å??"
+
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "è¼¸å?¥æ³?"
 
-#: ../widgets/text/e-text.c:3548
-#: ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3303 ../widgets/text/e-text.c:3304
 msgid "Event Processor"
 msgstr "äº?ä»¶è??ç??å?¨"
 
-#: ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3310 ../widgets/text/e-text.c:3311
+msgid "Text"
+msgstr "æ??å?"
+
+#: ../widgets/text/e-text.c:3317 ../widgets/text/e-text.c:3318
 msgid "Bold"
 msgstr "ç²?é«?"
 
-#: ../widgets/text/e-text.c:3569
-#: ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3324 ../widgets/text/e-text.c:3325
 msgid "Strikeout"
 msgstr "å?ªé?¤ç·?"
 
-#: ../widgets/text/e-text.c:3576
-#: ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3331 ../widgets/text/e-text.c:3332
 msgid "Anchor"
 msgstr "é?¨é»?"
 
-#: ../widgets/text/e-text.c:3583
-#: ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3338 ../widgets/text/e-text.c:3339
 msgid "Justification"
 msgstr "å·¦å?³å°?é½?"
 
-#: ../widgets/text/e-text.c:3590
-#: ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3345 ../widgets/text/e-text.c:3346
 msgid "Clip Width"
 msgstr "å?ªè¼¯é??åº¦"
 
-#: ../widgets/text/e-text.c:3597
-#: ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3352 ../widgets/text/e-text.c:3353
 msgid "Clip Height"
 msgstr "å?ªè¼¯é«?åº¦"
 
-#: ../widgets/text/e-text.c:3604
-#: ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3359 ../widgets/text/e-text.c:3360
 msgid "Clip"
 msgstr "å?ªè¼¯"
 
-#: ../widgets/text/e-text.c:3611
-#: ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3366 ../widgets/text/e-text.c:3367
 msgid "Fill clip rectangle"
 msgstr "å¡«æ»¿å?ªè¼¯æ?¹å¡?"
 
-#: ../widgets/text/e-text.c:3618
-#: ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3373 ../widgets/text/e-text.c:3374
 msgid "X Offset"
 msgstr "X ä½?ç§»"
 
-#: ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3380 ../widgets/text/e-text.c:3381
 msgid "Y Offset"
 msgstr "Y ä½?ç§»"
 
-#: ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3415 ../widgets/text/e-text.c:3416
 msgid "Text width"
 msgstr "æ??å?é??åº¦"
 
-#: ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3422 ../widgets/text/e-text.c:3423
 msgid "Text height"
 msgstr "æ??å?é«?åº¦"
 
-#: ../widgets/text/e-text.c:3681
-#: ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3436 ../widgets/text/e-text.c:3437
 msgid "Use ellipsis"
 msgstr "ä½¿ç?¨ç??ç?¥è??"
 
-#: ../widgets/text/e-text.c:3688
-#: ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3443 ../widgets/text/e-text.c:3444
 msgid "Ellipsis"
 msgstr "æ©¢å??"
 
-#: ../widgets/text/e-text.c:3695
-#: ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3450 ../widgets/text/e-text.c:3451
 msgid "Line wrap"
 msgstr "æ??è¡?"
 
-#: ../widgets/text/e-text.c:3702
-#: ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3457 ../widgets/text/e-text.c:3458
 msgid "Break characters"
 msgstr "ä¸æ?·å?ç¬¦"
 
-#: ../widgets/text/e-text.c:3709
-#: ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3464 ../widgets/text/e-text.c:3465
 msgid "Max lines"
 msgstr "æ??å¤§è¡?æ?¸"
 
-#: ../widgets/text/e-text.c:3730
-#: ../widgets/text/e-text.c:3731
+#: ../widgets/text/e-text.c:3485 ../widgets/text/e-text.c:3486
 msgid "Draw borders"
 msgstr "ç¹ªè£½æ¡?ç·?"
 
-#: ../widgets/text/e-text.c:3737
-#: ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Allow newlines"
 msgstr "å??è¨±æ?°è¡?"
 
-#: ../widgets/text/e-text.c:3744
-#: ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Draw background"
 msgstr "ç¹ªè£½è??æ?¯"
 
-#: ../widgets/text/e-text.c:3751
-#: ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Draw button"
 msgstr "ç¹ªè£½æ??é??"
 
-#: ../widgets/text/e-text.c:3758
-#: ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
 msgid "Cursor position"
 msgstr "æ¸¸æ¨?ä½?ç½®"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766
-#: ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3523
 msgid "IM Context"
 msgstr "IM å¿«é¡¯è¦?çª?"
 
-#: ../widgets/text/e-text.c:3774
-#: ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
 msgid "Handle Popup"
 msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
-
-#~ msgid " Ch_eck for Supported Types "
-#~ msgstr " æª¢æ?¥å?¯æ?¯æ?´ç??é¡?å??(_E) "
-#~ msgid "Ch_eck for Supported Types "
-#~ msgstr " æª¢æ?¥å?¯æ?¯æ?´ç??é¡?å??(_E) "
-#~ msgid "Could not open autosave file"
-#~ msgstr "ç?¡æ³?é??å??è?ªå??å?²å?æª?æ¡?"
-#~ msgid "Could not create object. %s"
-#~ msgstr "ç?¡æ³?å»ºç«?ç?©ä»¶ã??%s"
-#~ msgid "Convert to a Mem_o"
-#~ msgstr "è½?æ??ç?ºå??å¿?é??(_O)"
-#~ msgid "Convert to a _Task"
-#~ msgstr "è½?æ??ç?ºå·¥ä½?(_T)"
-#~ msgid "Convert the selected message to a new event"
-#~ msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??äº?ä»¶"
-#~ msgid "Convert the selected message to a new meeting"
-#~ msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??æ??è°"
-#~ msgid "Convert the selected message to a new memo"
-#~ msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??å??å¿?é??"
-#~ msgid "Convert the selected message to a new task"
-#~ msgstr "å°?é?¸å®?ç??é?µä»¶è½?æ??ç?ºæ?°ç??å·¥ä½?"
-#~ msgid "Completed on %B %d, %Y, %l:%M %p"
-#~ msgstr "å®?æ??æ?¼ %Y å¹´ %-m æ?? %-d æ?¥%p %-l:%M"
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
index df42a2d..2b6b7f8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,341 +3,34 @@
 # Joe Man <trmetal yahoo com hk>, 2001.
 # Chao-Hsiung Liao <pesder liao msa hinet net>, 2003.
 # Craig Jeffares <cjeffares novell com>,2004.
-# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005.
+# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010.
 # Abel Cheung <abelcheung gmail com>, 2006.
-#
+#: ../shell/main.c:511
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.27.4\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2009-09-18 12:14+0000\n"
-"PO-Revision-Date: 2009-09-18 21:29+0800\n"
+"Project-Id-Version: evolution 2.29.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-21 21:07+0800\n"
+"PO-Revision-Date: 2010-01-21 15:57+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
-"Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
+"Language-Team: Chinese (traditional)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution address book"
-msgstr "evolution é??è¨?é??"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:208
-msgid "New Contact"
-msgstr "æ?°å¢?é?£çµ¡äºº"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:216
-msgid "New Contact List"
-msgstr "æ?°å¢?é?£çµ¡äººæ¸?å?®"
-
-#: ../a11y/addressbook/ea-minicard-view.c:161
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "ç?®å??ç??é??è¨?é??è³?æ??å¤¾ %s æ?? %d å¼µå??ç??"
-msgstr[1] "ç?®å??ç??é??è¨?é??è³?æ??å¤¾ %s æ?? %d å¼µå??ç??"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "é??å??"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "é?£çµ¡äººæ¸?å?®: "
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "é?£çµ¡äºº: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "Evolution è¿·ä½ å??ç??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:263
-msgid "It has alarms."
-msgstr "å®?å?·æ??é¬§é?´ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:266
-msgid "It has recurrences."
-msgstr "å®?æ?¯é?±æ??æ?§ç´?æ??ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:269
-msgid "It is a meeting."
-msgstr "é??æ?¯ä¸?é ?æ??è°ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:275
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ??è¦?ç?º %sã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-msgid "Calendar Event: It has no summary."
-msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ²?æ??æ??è¦?ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:297
-msgid "calendar view event"
-msgstr "è¡?äº?æ??æª¢è¦?äº?ä»¶"
-
-#: ../a11y/calendar/ea-cal-view-event.c:525
-msgid "Grab Focus"
-msgstr "å¾?å?°ç?¦é»?"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "æ?°å¢?ç´?æ??"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "æ?°å¢?å?¨å¤©äº?ä»¶"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "æ?°å¢?æ??è°"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "ç§»è?³ä»?æ?¥"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "ç§»è?³æ?¥æ??"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:300
-#: ../a11y/calendar/ea-week-view-main-item.c:297
-msgid "a table to view and select the current time range"
-msgstr "ç?¨ä¾?æª¢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??è¡¨æ ¼"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148
-#: ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "å®?æ?? %d å??äº?ä»¶ã??"
-msgstr[1] "å®?æ?? %d å??äº?ä»¶ã??"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152
-#: ../a11y/calendar/ea-week-view.c:149
-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."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-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."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "æ?¥æª¢è¦?ï¼?%sã??%s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "å·¥ä½?é?±ç??è¡?äº?æ??æª¢è¦?"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "ç?¨æ?¼ä¸?æ??å¤?æ?¥ç??è¡?äº?æ??æª¢è¦?"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:771
-msgid "%A %d %b %Y"
-msgstr "%Y/%m/%d (%a)"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/e-day-view-top-item.c:844
-#: ../calendar/gui/e-day-view.c:1593
-#: ../calendar/gui/e-week-view-main-item.c:368
-msgid "%a %d %b"
-msgstr "%-m æ?? %-d æ?¥ (%a)"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:783
-msgid "%a %d %b %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:802
-#: ../calendar/gui/calendar-component.c:808
-#: ../calendar/gui/calendar-component.c:810
-msgid "%d %b %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:800
-#: ../calendar/gui/e-day-view-top-item.c:848
-#: ../calendar/gui/e-day-view.c:1609
-#: ../calendar/gui/e-week-view-main-item.c:382
-msgid "%d %b"
-msgstr "%-m æ?? %-d æ?¥"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:782
-msgid "Gnome Calendar"
-msgstr "Gnome è¡?äº?æ??"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "æ??å°?å??"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "evolution è¡?äº?æ??æ??å°?å??"
-
-#: ../a11y/calendar/ea-jump-button.c:146
-msgid "Jump button"
-msgstr "è·³èº?æ??é??"
-
-#: ../a11y/calendar/ea-jump-button.c:155
-msgid "Click here, you can find more events."
-msgstr "æ??é??è£¡ï¼?æ?¨å?¯ä»¥æ?¾å?°æ?´å¤?äº?ä»¶ã??"
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "æ??æª¢è¦?ï¼?%sã??%s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "é?±æª¢è¦?ï¼?%sã??%s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??æª¢è¦?"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??æª¢è¦?"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "å½?å?º"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "å½?å?ºå?é?¸å?®"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "ç·¨è¼¯"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
-msgid "begin editing this cell"
-msgstr "é??å§?ç·¨è¼¯æ¤å?²å?æ ¼"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "å??æ??"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
-msgid "toggle the cell"
-msgstr "å??æ??å?²å?æ ¼"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "å±?é??"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
-msgid "expands the row in the ETree containing this cell"
-msgstr "å±?é?? ETree ä¸å??å?«æ¤å?²å?æ ¼ç??å??"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "æ?¶æ?º"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
-msgid "collapses the row in the ETree containing this cell"
-msgstr "æ??ç?? ETree ä¸å??å?«æ¤å?²å?æ ¼ç??å??"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:120
-msgid "Table Cell"
-msgstr "è¡¨æ ¼ç??å?²å?æ ¼"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
-#: ../widgets/table/e-table-click-to-add.c:578
-msgid "click to add"
-msgstr "è«?æ??é??è£¡å? å?¥"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
-msgid "click"
-msgstr "å?®æ??"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "æ??åº?"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "è¡?äº?æ??ï¼?å¾? %s å?° %s"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "evolution è¡?äº?æ??é ?ç?®"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "çµ?å??æ??é??"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "ä½¿ç?¨é ?è¨å?¼"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "å½?å?ºå¼?é?¸å?®"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
 msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??é??è¨?é??ã??è«?å¾?é??è¨?é??æª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
 msgstr "æ¤é?£çµ¡äººç??é?»å?é?µä»¶å?°å??å·²ç¶?å?å?¨ã??æ?¨ç?¡è«?å¦?ä½?é?½è¦?å? å?¥å??æ¨£ä½?å??ç??æ?°å??ç??å??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:4
@@ -357,8 +50,13 @@ msgid "Category editor not available."
 msgstr "å??é¡?ç·¨è¼¯å?¨ç?¡æ³?ä½¿ç?¨ã??"
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "è«?æª¢æ?¥ä¾?ç¢ºå®?æ?¨ç??å¯?ç¢¼æ?¼æ³?æ£ç¢ºï¼?è??ä¸?æ?¨ä½¿ç?¨ç??æ?¯æ?¯æ?´ç??ç?»å?¥æ?¹æ³?ã??è«?è¨?å¾?è¨±å¤?å¯?ç¢¼æ??å??å??å¤§å°?å¯«ï¼?æ?¨å?¯è?½å??å??äº?å¤§å¯«é??å®?é?µã??"
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"è«?æª¢æ?¥ä¾?ç¢ºå®?æ?¨ç??å¯?ç¢¼æ?¼æ³?æ£ç¢ºï¼?è??ä¸?æ?¨ä½¿ç?¨ç??æ?¯æ?¯æ?´ç??ç?»å?¥æ?¹æ³?ã??è«?è¨?å¾?è¨±å¤?å¯?ç¢¼æ??"
+"å??å??å¤§å°?å¯«ï¼?æ?¨å?¯è?½å??å??äº?å¤§å¯«é??å®?é?µã??"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -369,1098 +67,539 @@ msgid "Could not remove address book."
 msgstr "ç?¡æ³?ç§»é?¤é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr "ç?®å??æ?¨å?ªè?½å?å?? Evolution ä¸ç?? GroupWise ç³»çµ±é??è¨?é??ã??è«?ä½¿ç?¨ä¸?æ¬¡å?¶ä»?ç?? GroupWise é?µä»¶å®¢æ?¶ç«¯ï¼?ä»¥å??å¾?æ?¨ç?? GroupWise å¸¸ç?¨é?£çµ¡äººå?? Groupwise å??äººé?£çµ¡äººè³?æ??å¤¾ã??"
+msgid ""
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+"ç?®å??æ?¨å?ªè?½å?å?? Evolution ä¸ç?? GroupWise ç³»çµ±é??è¨?é??ã??è«?ä½¿ç?¨ä¸?æ¬¡å?¶ä»?ç?? "
+"GroupWise é?µä»¶å®¢æ?¶ç«¯ï¼?ä»¥å??å¾?æ?¨ç?? GroupWise å¸¸ç?¨é?£çµ¡äººå?? Groupwise å??äººé?£çµ¡äºº"
+"è³?æ??å¤¾ã??"
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "å?ªé?¤é??è¨?é??ã??{0}ã??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "è¼?å?¥é??è¨?é??ç?¼ç??é?¯èª¤ã??"
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "å°? {0} å?²å?è?³ {1} ç?¼ç??é?¯èª¤ï¼? {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "ç?¡æ³?é©?è? LDAP ä¼ºæ??å?¨ã??"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
 msgid "Failed to delete contact"
 msgstr "å?ªé?¤é?£çµ¡äººå¤±æ??"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise é??è¨?é??ç??å»ºç«?"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP ä¼ºæ??å?¨æ?ªå??æ??æ??æ??ç??ç¶±è¦?è³?è¨?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
-msgid "Server Version"
-msgstr "ä¼ºæ??å?¨ç??æ?¬"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨æ?¨ç?®å??ç??ä¼ºæ??å?¨ç??æ?¬ä¸?æ£å¸¸é??ä½?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution é??è¨?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The image you have selected is large. Do you want to resize and store it?"
+#: ../addressbook/addressbook.error.xml.h:20
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr "ä½ æ??é?¸æ??ç??å??ç??å¤ªå¤§ã??æ?¨æ?¯å?¦è¦?æ?¹è®?å¤§å°?å¾?æ??å?²å?å®?ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:23
-msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
-msgstr "æ¤ LDAP ä¼ºæ??å?¨å?¯è?½ä½¿ç?¨è??ç?? LDAP ç??æ?¬ï¼?å®?ä¸?æ?¯æ?´æ¤å??è?½ï¼?æ??å?¯è?½è¨å®?é?¯èª¤ã??è«?æ´½è©¢ç®¡ç??å?¡ï¼?ç?è§£æ?¯æ?´ç??æ??å°?å?ºç¤?ã??"
+#: ../addressbook/addressbook.error.xml.h:21
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"æ¤ LDAP ä¼ºæ??å?¨å?¯è?½ä½¿ç?¨è??ç?? LDAP ç??æ?¬ï¼?å®?ä¸?æ?¯æ?´æ¤å??è?½ï¼?æ??å?¯è?½è¨å®?é?¯èª¤ã??è«?æ´½è©¢"
+"ç®¡ç??å?¡ï¼?ç?è§£æ?¯æ?´ç??æ??å°?å?ºç¤?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "ç?¡æ³?é??å??æ¤é??è¨?é??ã??"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book server does not have any suggested search bases."
 msgstr "æ¤é??è¨?é??ä¼ºæ??å?¨æ²?æ??ä»»ä½?å»ºè°ç??æ??å°?å?ºç¤?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr "æ¤é??è¨?é??ä¼ºæ??å?¨ç?¡æ³?é?£ç·?ï¼?æ??ä¼ºæ??å?¨å??ç¨±å?¯è?½æ?¼é?¯ï¼?æ??æ?¨ç??ç¶²è·¯é?£ç·?å·²ç¶?å??æ¢ã??"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "æ¤é??è¨?é??å°?è¢«æ°¸é? ç§»é?¤ã??"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "æ¤ä¼ºæ??å?¨ä¸?æ?¯æ?´ LDAPv3 ç¶±è¦?è³?è¨?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "ç?¡æ³?é??å??é??è¨?é??"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "ç?¡æ³?å?·è¡?æ??å°?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "ç?¡æ³?å?²å? {0}ã??"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "è¦?å?²å?æ??å??ç??è®?æ?´ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:33
-msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
-msgstr "æ?¨æ£å?¨å??è©¦å¾?æ??ä¸?å??é??è¨?é??ï¼?å°?é?£çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??ï¼?ä½?æ?¯å®?ç?¡æ³?å¾?ä¾?æº?ç§»é?¤ã??æ?¨æ?³è¦?å?²å?ä¸?å??å?¯æ?¬ä¾?ä»£æ?¿å??ï¼?"
+#: ../addressbook/addressbook.error.xml.h:31
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"æ?¨æ£å?¨å??è©¦å¾?æ??ä¸?å??é??è¨?é??ï¼?å°?é?£çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??ï¼?ä½?æ?¯å®?ç?¡æ³?å¾?ä¾?æº?ç§»é?¤ã??æ?¨"
+"æ?³è¦?å?²å?ä¸?å??å?¯æ?¬ä¾?ä»£æ?¿å??ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:34
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
-msgstr "æ?¨æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??å¤ª"
+#: ../addressbook/addressbook.error.xml.h:32
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+"æ?¨æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??"
+"è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??å¤ª"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "æ?¨æ²?æ??è¶³å¤ ç??æ¬?é??å?ªé?¤é??å??é??è¨?é??ä¸ç??é?£çµ¡äººã??"
 
-#: ../addressbook/addressbook.error.xml.h:36
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+#: ../addressbook/addressbook.error.xml.h:34
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr "æ?¨å·²ç¶?ä¿®æ?¹æ¤é?£çµ¡äººã??è¦?å?²å?é??äº?è®?æ?´ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:37
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:35
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨ {0} ç??é?£çµ¡äººã??"
 
-#: ../addressbook/addressbook.error.xml.h:38
-#: ../mail/em-vfolder-rule.c:513
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../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:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "æ?¾æ£?(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "ä¸?è¦?å?²å?(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "èª¿æ?´å¤§å°?(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 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:44
-#: ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:143
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:590
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "é ?è¨ç??å??æ¥å?°å??:"
 
-#: ../addressbook/conduit/address-conduit.c:1613
-#: ../addressbook/conduit/address-conduit.c:1614
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "ç?¡æ³?è¼?å?¥é??è¨?é??"
 
-#: ../addressbook/conduit/address-conduit.c:1691
-#: ../addressbook/conduit/address-conduit.c:1694
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "ç?¡æ³?è®?å?? pilot é??è¨?é??ç¨?å¼?å??å¡?"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "C_ontacts"
-msgstr "é?£çµ¡äºº(_O)"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "æ??è?"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure contacts and autocompletion here"
-msgstr "å?¨æ¤è¨å®?é?£çµ¡äººè??è?ªå??å®?æ??"
-
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:193
-#: ../calendar/gui/migration.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:579
-msgid "Contacts"
-msgstr "é?£çµ¡äºº"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Address Book"
-msgstr "Evolution é??è¨?é??"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book address popup"
-msgstr "Evolution é??è¨?é??ä½?å??å½?å?ºå¼?é ?ç?®"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address viewer"
-msgstr "Evolution é??è¨?é??å?°å??æª¢è¦?å?¨"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book card viewer"
-msgstr "Evolution é??è¨?é??å??ç??æª¢è¦?å?¨"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book component"
-msgstr "Evolution é??è¨?é??å??ä»¶"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution S/MIME Certificate Management Control"
-msgstr "Evolution S/MIME æ??è?ç®¡ç??æ?§å?¶"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution è³?æ??å¤¾è¨å®?çµ?æ??æ?§å?¶"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Manage your S/MIME certificates here"
-msgstr "å?¨æ¤ç®¡ç??æ?¨ç?? S/MIME æ??è?"
-
-#. create the local source group
-#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:97
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:192
-#: ../calendar/gui/memos-component.c:151
-#: ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:576
-#: ../calendar/gui/migration.c:1090
-#: ../calendar/gui/tasks-component.c:148
-#: ../mail/em-folder-tree-model.c:191
-#: ../mail/em-folder-tree-model.c:193
-#: ../mail/em-migrate.c:2890
-#: ../mail/mail-component.c:320
-#: ../mail/mail-vfolder.c:217
-#: ../mail/message-list.c:1515
-msgid "On This Computer"
-msgstr "æ??ç??é?»è?¦"
-
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:98
-#: ../addressbook/gui/component/addressbook-migrate.c:517
-msgid "On LDAP Servers"
-msgstr "å?¨ LDAP ä¼ºæ??å?¨"
-
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:135
-#: ../addressbook/gui/component/addressbook-component.c:138
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
-#: ../calendar/gui/calendar-component.c:232
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:189
-#: ../calendar/gui/memos-component.c:193
-#: ../calendar/gui/migration.c:484
-#: ../calendar/gui/migration.c:584
-#: ../calendar/gui/migration.c:1098
-#: ../calendar/gui/tasks-component.c:186
-#: ../calendar/gui/tasks-component.c:190
-#: ../mail/em-migrate.c:960
-#: ../plugins/email-custom-header/email-custom-header.c:337
-msgid "Personal"
-msgstr "å??äºº"
-
-#: ../addressbook/gui/component/addressbook-component.c:209
-msgctxt "New"
-msgid "_Contact"
-msgstr "é?£çµ¡äºº(_C)"
-
-#: ../addressbook/gui/component/addressbook-component.c:210
-msgid "Create a new contact"
-msgstr "å»ºç«?æ?°ç??é?£çµ¡äºº"
-
-#: ../addressbook/gui/component/addressbook-component.c:217
-msgctxt "New"
-msgid "Contact _List"
-msgstr "é?£çµ¡äººæ¸?å?®(_L)"
-
-#: ../addressbook/gui/component/addressbook-component.c:218
-msgid "Create a new contact list"
-msgstr "å»ºç«?æ?°ç??é?£çµ¡äººæ¸?å?®"
-
-#: ../addressbook/gui/component/addressbook-component.c:224
-#: ../addressbook/gui/component/addressbook-config.c:1245
-msgid "New Address Book"
-msgstr "æ?°é??è¨?é??"
-
-#: ../addressbook/gui/component/addressbook-component.c:225
-msgctxt "New"
-msgid "Address _Book"
-msgstr "é??è¨?é??(_B)"
-
-#: ../addressbook/gui/component/addressbook-component.c:226
-msgid "Create a new address book"
-msgstr "å»ºç«?æ?°é??è¨?é??"
-
-#: ../addressbook/gui/component/addressbook-component.c:389
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "å??ç´?é??è¨?é??è¨å®?å?¼æ??è³?æ??å¤¾å¤±æ??ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:217
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
-msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ SSL)ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:219
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
-msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ TLS)ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:221
-msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
-msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?æ?¨ç??ä¼ºæ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??è¡¨ç¤ºæ?¨ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?æ?¨ç??å®?å?¨æ??æ¼?æ´?ã?? "
-
-#: ../addressbook/gui/component/addressbook-config.c:346
-msgid "Base"
-msgstr "å?ºæ?¬"
-
-#: ../addressbook/gui/component/addressbook-config.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "_Type:"
-msgstr "é¡?å??(_T):"
-
-#: ../addressbook/gui/component/addressbook-config.c:648
-msgid "Copy _book content locally for offline operation"
-msgstr "è¤?è£½é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥(_B)"
-
-#: ../addressbook/gui/component/addressbook-config.c:759
-msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
-msgstr "é??æ?¯ LDAP ä¼ºæ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??è©¦é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?æ´½è©¢æ?¨ç??ç³»çµ±ç®¡ç??å?¡ï¼?ç?è§£æ?¨æ??è©²æ??å®?ç??å? ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:837
-msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
-msgstr "é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è?æ?¨ç??æ?¹æ³?ã??æ³¨æ??è¦?è¨å®?æ¤é ?è?³ã??é?»å?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿å??å?å??æ?¨ç?? LDAP ä¼ºæ??å?¨ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:916
-msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
-msgstr "æ??å°?ç¯?å??æ??å®?ç¾©æ?¨æ?³å¾?ç¶²è·¯ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??\"sub\" ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??ä¸?å??ã??ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:1020
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../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.glade.h:95
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "ä¸?è?¬"
-
-#: ../addressbook/gui/component/addressbook-config.c:1021
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "é??è¨?é??"
-
-#: ../addressbook/gui/component/addressbook-config.c:1025
-msgid "Server Information"
-msgstr "ä¼ºæ??å?¨è³?è¨?"
-
-#: ../addressbook/gui/component/addressbook-config.c:1027
-msgid "Authentication"
-msgstr "é©?è?"
-
-#: ../addressbook/gui/component/addressbook-config.c:1030
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "è©³ç´°è³?æ??"
-
-#: ../addressbook/gui/component/addressbook-config.c:1031
-#: ../mail/em-folder-browser.c:1021
-msgid "Searching"
-msgstr "æ£å?¨æ??å°?"
-
-#: ../addressbook/gui/component/addressbook-config.c:1033
-msgid "Downloading"
-msgstr "ä¸?è¼?ä¸"
-
-#: ../addressbook/gui/component/addressbook-config.c:1243
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "Address Book Properties"
-msgstr "é??è¨?é??å?§å®¹"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148
-#: ../mail/em-migrate.c:1109
-msgid "Migrating..."
-msgstr "æ£å?¨ç§»è½?..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195
-#: ../mail/em-migrate.c:1168
-#, c-format
-msgid "Migrating '%s':"
-msgstr "æ£å?¨ç§»è½?ã??%sã??ï¼?"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP ä¼ºæ??å?¨"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:760
-msgid "Autocompletion Settings"
-msgstr "è?ªå??å®?æ??è¨å®?"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
-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 ""
-"Evolution é?£çµ¡äººè³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"é?µå¯?æ¸?å?®é?£çµ¡äººç??æ ¼å¼?å·²ç¶?è®?æ?´ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution å?²å?é?¨ä»½é?»è©±è??ç¢¼ç??æ?¹å¼?å·²ç¶?è®?æ?´ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution ç?? Palm Sync è®?æ?´è¨?é??å??æ? å°?æª?æ¡?å·²ç¶?è®?æ?´ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?æ?¨ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:453
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "é??æ?°å?½å??ã??%sã??è³?æ??å¤¾ç?ºï¼?"
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:455
-msgid "Rename Folder"
-msgstr "é??æ?°å?½å??è³?æ??å¤¾"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:461
-msgid "Folder names cannot contain '/'"
-msgstr "è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«æ??ç·?ã??"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "æ?°å¢?é??è¨?é??(_N)"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "å?²å?ç?º vCard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:628
-#: ../calendar/gui/memos-component.c:479
-#: ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2122
-#: ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "é??æ?°å?½å??(_R)..."
-
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/calendar-component.c:631
-#: ../calendar/gui/e-calendar-table.c:1613
-#: ../calendar/gui/e-calendar-view.c:1828
-#: ../calendar/gui/e-memo-table.c:949
-#: ../calendar/gui/memos-component.c:482
-#: ../calendar/gui/tasks-component.c:475
-#: ../mail/em-folder-tree.c:2119
-#: ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35
-#: ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "å?ªé?¤(_D)"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:636
-#: ../calendar/gui/memos-component.c:487
-#: ../calendar/gui/tasks-component.c:480
-#: ../mail/em-folder-tree.c:2127
-#: ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "å±¬æ?§(_P)"
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "é?£çµ¡äººä¾?æº?é?¸æ??å?¨"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
-msgid "Failed to authenticate.\n"
-msgstr "é©?è?æ??è?å¤±æ??ã??\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
-
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:519
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "è¼¸å?¥å¯?ç¢¼"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "è?ªå??å®?æ??é?·åº¦"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "å®?æ?? uris æ¸?å?®ç?? EFolderList xml"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "å®?æ?? uris æ¸?å?®ç?? EFolderList xml"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
-msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨å??ç??ã??æ¸?å?®æª¢è¦?è??é ?è¦½çª?æ ¼ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "é¡¯ç¤ºè?ªå??è£?é½?ç??å§?å??è??ä½?å??"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "é¡¯ç¤ºé ?è¦½çª?æ ¼"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
-msgstr "å?¨ Evolution å??è©¦è?ªå??å®?æ??ä¹?å??ï¼?å¿?é ?è¼¸å?¥ç??å?å??æ?¸ç?®ã??"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
-msgid "URI for the folder last used in the select names dialog"
-msgstr "ä¸?æ¬¡ç?¨æ?¼é?¸å??å??ç¨±å°?è©±ç??ç??è³?æ??å¤¾ URI"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-msgid "URI for the folder last used in the select names dialog."
-msgstr "ä¸?æ¬¡ç?¨æ?¼é?¸å??å??ç¨±å°?è©±ç??ç??è³?æ??å¤¾ URI"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
-msgid "Vertical pane position"
-msgstr "å??ç?´çª?æ ¼ä½?ç½®"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
-msgstr "æ?¯å?¦å¼·å?¶é¡¯ç¤ºå?¨é ?ç?®ä¸è?ªå??è£?é½?ç??é?£çµ¡äººå§?å??è??é?»å?é?µä»¶ä½?å??ã??"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "æ?¯å?¦é¡¯ç¤ºé ?è¦½çª?æ ¼ã??"
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Autocompletion"
-msgstr "è?ªå??å®?æ??"
-
-#: ../addressbook/gui/component/autocompletion-config.c:177
-msgid "Always _show address of the autocompleted contact"
-msgstr "æ°¸é? é¡¯ç¤ºè?ªå??è£?é½?ç??é?£çµ¡äººä½?å??(_S)"
-
-#: ../addressbook/gui/component/autocompletion-config.c:182
-msgid "Date/Time Format"
-msgstr "æ?¥æ??/æ??å?»æ ¼å¼?"
-
-#: ../addressbook/gui/component/autocompletion-config.c:185
-#: ../mail/em-mailer-prefs.c:1456
-msgid "Table column:"
-msgstr "è¡¨æ ¼æ¬?ï¼?"
-
-#: ../addressbook/gui/component/autocompletion-config.c:187
-msgid "Look up in address books"
-msgstr "å?¨é??è¨?é??ä¸æ?¥è©¢"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
-"389\n"
-"636\n"
-"3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "5"
-msgstr "5"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>é©?è?</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>ä¸?è¼?ä¸</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>æ??å°?ä¸</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid ""
-"Anonymously\n"
-"Using email address\n"
-"Using distinguished name (DN)"
-msgstr ""
-"å?¿å??\n"
-"ä½¿ç?¨é?»å?é?µä»¶ä½?å??\n"
-"ä½¿ç?¨è¾¨èª?ç??å??ç¨± (DN)"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-msgid "B_rowse this book until limit reached"
-msgstr "ç??è¦½é??å??é??è¨?é??ç?´å?°é??å?¶(_R)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution æ??ä½¿ç?¨æ¤é?»å?é?µä»¶å?°å??ï¼?å?¨ä¼ºæ??å?¨é©?è?æ?¨ç??èº«ä»½ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Lo_gin:"
-msgstr "ç?»å?¥(_G):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"å?®ä¸?\n"
-"å?¯"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"SSL encryption\n"
-"TLS encryption\n"
-"No encryption"
-msgstr ""
-"SSL å? å¯?\n"
-"TLS å? å¯?\n"
-"ä¸?å? å¯?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-msgid "Search Filter"
-msgstr "æ??å°?é??æ¿¾å?¨"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-msgid "Search _base:"
-msgstr "æ??å°?èµ·é»?(_B):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search _filter:"
-msgstr "æ??å°?é??æ¿¾å?¨(_F):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
-msgstr "æ??å°?é??æ¿¾å?¨æ?¯å?¨é?²è¡?æ??å°?æ??ä½¿ç?¨ç??ç?©ä»¶é¡?å??ã??å¦?æ??æ¤é ?æ²?æ??è¢«ä¿®æ?¹ï¼?é ?è¨ç??æ??å°?ç?®æ¨?æ?¯ã??personã??ç?©ä»¶é¡?å??ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Supported Search Bases"
-msgstr "æ?¯æ?´ç??æ??å°?èµ·é»?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
-msgstr "æ??å°?å?ºç¤?æ?¯æ??é ?ç?®ç??å?¯è¾¨è?å??ç¨± (DN)ï¼?æ??å°?æ??ç?±æ¤è??é??å§?ã??å¦?æ??æ¤è??ç©ºç?½ï¼?æ??å°?æ??å?¨ç?®é??æ¨¹ç??åº?å±¤é??å§?ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "This is the full name of your LDAP server. For example, \"ldap.mycompany.com\"."
-msgstr "é??æ?¯æ?¨ç?? LDAP ä¼ºæ??å?¨ç??å®?æ?´å??ç¨±ã??ä¾?å¦?ï¼?ã??ldap.mycompany.comã??ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
-msgstr "é??æ?¯è¦?ä¸?è¼?é ?ç?®ç??æ?¸ç?®ä¸?é??ã??å°?æ¤æ?¸å?è¨å®?æ??å¤ªå¤§æ??æ¸?æ?¢é??è¨?é??ç??é??åº¦ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
-msgstr "é??æ?¯æ¤ä¼ºæ??å?¨ç??å??ç¨±ï¼?æ??é¡¯ç¤ºå?¨æ?¨ç?? Evolution è³?æ??å¤¾æ¸?å?®ä¸ã??å®?å??ç?¨æ?¼é¡¯ç¤ºç?¨é??ã?? "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid "_Download limit:"
-msgstr "ä¸?è¼?é??å?¶(_D):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid "_Find Possible Search Bases"
-msgstr "å°?æ?¾å?¯è?½ç??æ??å°?å?ºç¤?(_F)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid "_Login method:"
-msgstr "ç?»å?¥æ?¹æ³?(_L):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-msgid "_Name:"
-msgstr "å??ç¨±(_N):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "_Port:"
-msgstr "é?£æ?¥å? (_P):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid "_Search scope:"
-msgstr "æ??å°?ç¯?å??(_S):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-#: ../mail/mail-config.glade.h:184
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Server:"
-msgstr "ä¼ºæ??å?¨(_S):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid "_Timeout:"
-msgstr "æ??é??(_T):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "_Use secure connection:"
-msgstr "ä½¿ç?¨å®?å?¨é?£ç·?(_U):"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid "cards"
-msgstr "å??ç??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:293
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:740
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-msgid "minutes"
-msgstr "å??é??"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>é?»å?é?µä»¶</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>ä½?å®¶</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>å?³æ??è¨?æ?¯</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>è?·æ¥</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>é??é ?</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Notes</b>"
-msgstr "<b>å??è¨»</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Other</b>"
-msgstr "<b>å?¶ä»?</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Telephone</b>"
-msgstr "<b>é?»è©±</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Web Addresses</b>"
-msgstr "<b>ç¶²å??</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:1987
+msgid "Anniversary"
+msgstr "é?±å¹´ç´?å¿µæ?¥"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "<b>Work</b>"
-msgstr "<b>å·¥ä½?</b>"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:110
+msgid "Birthday"
+msgstr "ç??æ?¥"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "å??é¡?(_T)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+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:1267
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "é?£çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
+#: ../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:2496
 msgid "Contact Editor"
 msgstr "é?£çµ¡äººç·¨è¼¯å?¨"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../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
+msgid "Email"
+msgstr "é?»å?é?µä»¶"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Free/Busy:"
+msgstr "ç©ºé??/å¿?ç¢?ï¼?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "Full _Name..."
 msgstr "å?¨å??(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "ä½?å®¶"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "Home Page:"
+msgstr "é¦?é ?ï¼?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Image"
 msgstr "å??ç??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Instant Messaging"
+msgstr "å?³æ??é??è¨?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Job"
+msgstr "å·¥ä½?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Mailing Address"
 msgstr "é?µå¯?å?°å??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+msgid "Miscellaneous"
+msgstr "é??é ?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Nic_kname:"
 msgstr "æ?±ç¨±(_K):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../calendar/gui/migration.c:1225
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../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
 msgid "Notes"
 msgstr "å??è¨»"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1695
+msgid "Other"
+msgstr "å?¶ä»?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "å??äººè³?è¨?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "é?»è©±"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+msgid "Video Chat:"
+msgstr "è¦?è¨?è??å¤©ï¼?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+msgid "Web Addresses"
+msgstr "ç¶²å??"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "Web Log:"
+msgstr "ç¶²èª?ï¼?"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../mail/e-mail-migrate.c:954
+msgid "Work"
+msgstr "å·¥ä½?"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Address:"
 msgstr "å?°å??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Anniversary:"
 msgstr "é?±å¹´ç´?å¿µæ?¥(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Assistant:"
 msgstr "å?©ç??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Birthday:"
 msgstr "ç??æ?¥(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:820
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../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:1909
 msgid "_Calendar:"
 msgstr "è¡?äº?æ??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_City:"
 msgstr "ç¸£/å¸?(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Company:"
 msgstr "å?¬å?¸(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Country:"
 msgstr "å??å®¶/å?°å??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Department:"
 msgstr "é?¨é??(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_File under:"
 msgstr "æ¸æª?ç?º(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Free/Busy:"
 msgstr "ç©ºé??/å¿?ç¢?(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Home Page:"
 msgstr "é¦?é ?(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Manager:"
 msgstr "ä¸»ç®¡(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Office:"
 msgstr "è¾¦å?¬å®¤(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
 msgstr "é?µç®±(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "è?·æ¥(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Spouse:"
 msgstr "é??å?¶(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "å·?/ç??(_S):"
 
 # (Abel) è?·ç¨±å??è¼¸å?¥é?£çµ¡äººæ??ç?? Title (Dr., Ms.) æ??è¡?çª?
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "é é??(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Video Chat:"
 msgstr "è¦?è¨?äº¤è«?(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "å?¯æ?¥å?? H_TML é?µä»¶"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Web Log:"
 msgstr "ç¶²èª?(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "é??è¨?é??(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Zip/Postal Code:"
 msgstr "é?µé??å??è??(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:473
-#: ../plugins/exchange-operations/exchange-delegates.c:951
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../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:61
+#: ../widgets/menus/gal-view-new-dialog.c:60
 msgid "Name"
 msgstr "å??ç¨±"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:324
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../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:1287
+#: ../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:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../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:1816
-#: ../widgets/text/e-text.c:3674
-#: ../widgets/text/e-text.c:3675
+#: ../widgets/table/e-cell-text.c:1655 ../widgets/text/e-text.c:3429
+#: ../widgets/text/e-text.c:3430
 msgid "Editable"
 msgstr "å?¯ç·¨è¼¯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:603
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../mail/em-migrate.c:959
-msgid "Work"
-msgstr "å·¥ä½?"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
+msgid "Error adding contact"
+msgstr "æ?°å¢?é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
-msgid "Home"
-msgstr "ä½?å®¶"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+msgid "Error modifying contact"
+msgstr "ä¿®æ?¹é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
-#: ../calendar/gui/e-calendar-view.c:2289
-msgid "Other"
-msgstr "å?¶ä»?"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+msgid "Error removing contact"
+msgstr "ç§»é?¤é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Source Book"
 msgstr "ä¾?æº?é??è¨?é??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 msgid "Target Book"
 msgstr "ç?®æ¨?é??è¨?é??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
 msgid "Is New Contact"
 msgstr "æ?¯æ?°é?£çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
 msgid "Writable Fields"
 msgstr "å?¯å¯«ç??æ¬?ä½?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
 msgid "Required Fields"
 msgstr "å¿?è¦?æ¬?ä½?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
 msgid "Changed"
 msgstr "å·²è®?æ?´"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2491
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "é?£çµ¡äººç·¨è¼¯å?¨ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2888
 msgid "Please select an image for this contact"
 msgstr "è«?é?¸å??ä»£è¡¨æ¤é?£çµ¡äººç??å??ç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "_No image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3162
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1468,211 +607,208 @@ msgstr ""
 "é?£çµ¡äººè³?æ??ç?¡æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "ã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3173
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sã??%sã??æ?¯ç©ºç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3213
 msgid "Invalid contact."
 msgstr "ç?¡æ??ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "å¿«é??æ?°å¢?é?£çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "ç·¨è¼¯å?¨é?¨(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "å?¨å??(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "é?»å?é?µä»¶(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "é?¸æ??é??è¨?é??(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"ç¢ºå®?è¦?å?ªé?¤\n"
-"é?£çµ¡äººæ¸?å?® (%s)ï¼?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:167
+#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:675
+msgid "Shell"
+msgstr "Shell"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:676
+msgid "The EShell singleton"
 msgstr ""
-"æ?¨ç¢ºå®?è¦?å?ªé?¤\n"
-"é??äº?é?£çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr ""
-"ç¢ºå®?è¦?å?ªé?¤\n"
-"é?£çµ¡äºº (%s)ï¼?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"æ?¨ç¢ºå®?è¦?å?ªé?¤\n"
-"é??äº?é?£çµ¡äººï¼?"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
+msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-msgstr ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
+msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "å?¨å??"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr "Jr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+msgid "Miss"
+msgstr "Miss"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr "Mr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr "Mrs."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr "Ms."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr "Sr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "å??å?(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "å§?æ°?(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "(_Middle):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "(_Suffix):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>æ??å?¡</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:692
 msgid "Contact List Editor"
 msgstr "é?£çµ¡äººæ¸?å?®ç·¨è¼¯å?¨"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
-#: ../calendar/gui/e-day-view-time-item.c:812
-#: ../calendar/gui/e-timezone-entry.c:118
-msgid "Select..."
-msgstr "é?¸æ??..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "Members"
+msgstr "æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "ç?¶å?³é??é?»å?é?µä»¶è?³æ¤æ¸?å?®æ??é?±è??å?¶ä½?å??(_H)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "å??å?ºå??ç¨±(_L):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:154
+msgid "_Select..."
+msgstr "é?¸å??(_S)..."
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 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:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:785
 msgid "Contact List Members"
 msgstr "é?£çµ¡äººæ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:933
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
 msgid "_Members"
 msgstr "æ??å?¡(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1185
+msgid "Error adding list"
+msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1199
+msgid "Error modifying list"
+msgstr "ç·¨è¼¯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1213
+msgid "Error removing list"
+msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
+#: ../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:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1277
 msgid "Is New List"
 msgstr "æ?¯æ?°ç??æ¸?å?®"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "è®?æ?´å¾?ç??é?£çµ¡äºº:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
 msgstr "è¡?çª?ç??é?£çµ¡äºº:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "å?µæ¸¬å?°é??è¤?ç??é?£çµ¡äºº"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+msgid ""
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
 msgstr "æ¤é?£çµ¡äººç??å??ç¨±æ??é?»å?é?µä»¶å?°å??å·²ç¶?å?å?¨æ?¼æ¤è³?æ??å¤¾ã??ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "æ?°ç??é?£çµ¡äºº:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "å??æ?¬ç??é?£çµ¡äºº:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -1680,74 +816,71 @@ msgstr ""
 "æ¤é?£çµ¡äººç??å??ç¨±æ??é?»å?é?µä»¶å?°å??å·²ç¶?å?å?¨\n"
 "æ?¼æ¤è³?æ??å¤¾ã??æ?¨ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "å??ä½µ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:198
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 msgstr "å??ä½µé?£çµ¡äºº"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:266
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
-#: ../addressbook/gui/widgets/eab-contact-display.c:868
-#: ../plugins/groupwise-features/junk-settings.c:420
-#: ../smime/lib/e-cert.c:808
-msgid "Email"
-msgstr "é?»å?é?µä»¶"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:79
-#: ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-memo-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:978
 msgid "Any field contains"
 msgstr "ä»»ä½?æ¬?ä½?å??å?«"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
 msgid "Email begins with"
 msgstr "é?»å?é?µä»¶é??å§?æ?¼"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Name contains"
 msgstr "å??ç¨±å??å?«"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "æ²?æ??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d å??é?£çµ¡äºº"
 msgstr[1] "%d å??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+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:460
-msgid "Error getting book view"
-msgstr "å??å¾?æ?¸æ?¬æª¢è¦?æ??ç?¼ç??é?¯èª¤"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+msgid "Search Interrupted"
+msgstr "æ??å°?è¢«ä¸æ?·"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
-#: ../widgets/table/e-table-click-to-add.c:507
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
+#: ../addressbook/gui/widgets/e-addressbook-view.c:758
+#: ../calendar/gui/e-memo-table.c:1061 ../calendar/gui/e-task-table.c:1360
+#: ../modules/calendar/e-memo-shell-content.c:603
+#: ../modules/calendar/e-task-shell-content.c:625
+#: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:817
-#: ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
+#: ../widgets/table/e-table.c:3349
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
+#: ../widgets/text/e-text.c:3297
 msgid "Model"
 msgstr "æ¨¡å??"
 
@@ -1755,120 +888,82 @@ msgstr "æ¨¡å??"
 msgid "Error modifying card"
 msgstr "ç·¨è¼¯å??ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "å??ç¨±é??å§?æ?¼"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+msgid "Cut selected contacts to the clipboard"
+msgstr "å?ªä¸?é?¸å??ç??é?£çµ¡äººè?³å?ªè²¼ç°¿"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+msgid "Copy selected contacts to the clipboard"
+msgstr "è¤?è£½é?¸å??ç??é?£çµ¡äººè?³å?ªè²¼ç°¿"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+msgid "Paste contacts from the clipboard"
+msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?é?£çµ¡äºº"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:735
+msgid "Delete selected contacts"
+msgstr "å?ªé?¤é?¸å®?ç??é?£çµ¡äºº"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+msgid "Select all visible contacts"
+msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:774
+#: ../calendar/gui/e-memo-table.c:1078 ../calendar/gui/e-task-table.c:1377
+#, fuzzy
+msgid "Shell View"
+msgstr "3_D å??é??è±¡æ£?æª¢è¦?"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Source"
 msgstr "ä¾?æº?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:564
-#: ../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
-msgid "Type"
-msgstr "é¡?å??"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
-msgid "Save as vCard..."
-msgstr "å?²å?ç?º vCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??äº?é?£çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1806
-#: ../calendar/gui/e-memo-table.c:932
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "é??å??(_O)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+msgid "Are you sure you want to delete this contact list?"
+msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-msgid "_New Contact..."
-msgstr "æ?°å¢?é?£çµ¡äºº(_N)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººæ¸?å?® (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "New Contact _List..."
-msgstr "æ?°å¢?é?£çµ¡äººæ¸?å?®(_L)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+msgid "Are you sure you want to delete these contacts?"
+msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??äº?é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Save as vCard..."
-msgstr "å?²å?æ?? _vCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+msgid "Are you sure you want to delete this contact?"
+msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Forward Contact"
-msgstr "è½?å¯?é?£çµ¡äºº(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äºº (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contacts"
-msgstr "è½?å¯?é?£çµ¡äºº(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"é??å?? %d å??é?£çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
+"ç¢ºå®?è¦?é¡¯ç¤ºé??è£¡æ??æ??ç??é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contact"
-msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_M)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to List"
-msgstr "å?³é??é?µä»¶çµ¦æ¸?å?®(_M)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to Contacts"
-msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_M)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "_Print"
-msgstr "å??å?°(_P)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
-msgid "Cop_y to Address Book..."
-msgstr "è¤?è£½å?°é??è¨?é??(_Y)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Mo_ve to Address Book..."
-msgstr "ç§»è?³é??è¨?é??(_V)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "Cu_t"
-msgstr "å?ªä¸?(_T)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1599
-#: ../calendar/gui/e-calendar-view.c:1813
-#: ../calendar/gui/e-memo-table.c:940
-#: ../mail/em-folder-tree.c:991
-#: ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2109
-#: ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:99
-#: ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "è¤?è£½(_C)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-msgid "P_aste"
-msgstr "è²¼ä¸?(_A)"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
-#: ../calendar/gui/cal-search-bar.c:624
-#: ../calendar/gui/cal-search-bar.c:667
-#: ../calendar/gui/cal-search-bar.c:686
-msgid "Any Category"
-msgstr "ä»»ä½?å??é¡?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+msgid "_Don't Display"
+msgstr "ä¸?è¦?é¡¯ç¤º(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
-#: ../calendar/gui/cal-search-bar.c:628
-#: ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Unmatched"
-msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+msgid "Display _All Contacts"
+msgstr "é¡¯ç¤ºæ??æ??ç??é?£çµ¡äºº(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "å?©ç??"
 
@@ -1897,8 +992,7 @@ msgid "Car Phone"
 msgstr "æ±½è»?é?»è©±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../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
@@ -1906,7 +1000,7 @@ msgid "Categories"
 msgstr "å??é¡?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "å?¬å?¸"
 
@@ -1955,22 +1049,22 @@ msgid "Journal"
 msgstr "æ?¥èª?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "ä¸»ç®¡"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:644
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "è¡?å??é?»è©±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "æ?±ç¨±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "å??è¨»"
 
@@ -1999,14 +1093,13 @@ msgid "Radio"
 msgstr "ç?¡ç·?é?»é?»è©±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:576
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "è§?è?²"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "é??å?¶"
 
@@ -2025,6 +1118,7 @@ msgid "Telex"
 msgstr "é?»å ±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:748
 msgid "Title"
 msgstr "é é??"
 
@@ -2038,38 +1132,28 @@ 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/misc/e-reflow.c:1421
-#: ../widgets/misc/e-reflow.c:1422
-#: ../widgets/table/e-table-click-to-add.c:521
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:994
-#: ../widgets/table/e-table-group-container.c:995
+#: ../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:3069
-#: ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716
-#: ../widgets/text/e-text.c:3717
+#: ../widgets/table/e-table-item.c:2879 ../widgets/table/e-table-item.c:2880
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 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/misc/e-reflow.c:1428
-#: ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-click-to-add.c:528
-#: ../widgets/table/e-table-group-container.c:987
-#: ../widgets/table/e-table-group-container.c:988
+#: ../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:3075
-#: ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723
-#: ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:2885 ../widgets/table/e-table-item.c:2886
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Height"
 msgstr "é«?åº¦"
 
@@ -2094,11 +1178,11 @@ msgstr "æ??å?æ¨¡å??"
 msgid "Max field name length"
 msgstr "æ??å¤§æ¬?ä½?å??ç¨±é?·åº¦"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "æ¬?å¯¬"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -2108,7 +1192,7 @@ msgstr ""
 "\n"
 "æ??å°?é?£çµ¡äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -2122,7 +1206,7 @@ msgstr ""
 "\n"
 "é??æ??é??è£¡ä»¥å»ºç«?æ?°ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -2136,7 +1220,7 @@ msgstr ""
 "\n"
 "é??æ??é??è£¡ä»¥å»ºç«?æ?°ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -2146,7 +1230,7 @@ msgstr ""
 "\n"
 "å°?æ?¾é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -2156,7 +1240,7 @@ msgstr ""
 "\n"
 "æ²?æ??é ?ç?®å?¯ä¾?é??ç¨®æª¢è¦?æ?¹å¼?é¡¯ç¤ºã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Adapter"
 msgstr "è½?æ?¥å?¨"
 
@@ -2169,7 +1253,7 @@ msgid "Home Email"
 msgstr "ä½?å®¶é?»å?é?µä»¶"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:825
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "å?¶å®?é?»å?é?µä»¶"
 
@@ -2181,254 +1265,315 @@ msgstr "å·²é?¸æ??"
 msgid "Has Cursor"
 msgstr "æ??æ¸¸æ¨?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../mail/em-popup.c:545
-msgid "_Open Link in Browser"
-msgstr "å?¨ç??è¦½å?¨å?§é??å??é?£çµ?(_O)"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "evolution é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2694
-msgid "_Copy Link Location"
-msgstr "è¤?è£½é?£çµ?ä½?å??(_C)"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "æ?°å¢?é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../mail/em-popup.c:546
-msgid "_Send New Message To..."
-msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "æ?°å¢?é?£çµ¡äººæ¸?å?®"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "ç?®å??ç??é??è¨?é??è³?æ??å¤¾ %s æ?? %d å¼µå??ç??"
+msgstr[1] "ç?®å??ç??é??è¨?é??è³?æ??å¤¾ %s æ?? %d å¼µå??ç??"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "é??å??"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "é?£çµ¡äººæ¸?å?®: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:142
+msgid "Contact: "
+msgstr "é?£çµ¡äºº: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "Evolution è¿·ä½ å??ç??"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:286
-#: ../addressbook/gui/widgets/eab-contact-display.c:360
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:370
+msgid "Copy the email address to the clipboard"
+msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??å?°å?ªè²¼ç°¿"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:375
+msgid "_Send New Message To..."
+msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:377
+msgid "Send a mail message to this address"
+msgstr "å?³é??é?µä»¶å?°é??å??ä½?å??"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(æ? å°?)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
-#: ../addressbook/gui/widgets/eab-contact-display.c:391
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "å°?æ? "
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:475
-#: ../addressbook/gui/widgets/eab-contact-display.c:835
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "æ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "é?¨é??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "è?·æ¥"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "è¦?è¨?äº¤è«?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
-#: ../calendar/gui/calendar-commands.c:89
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2548
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:572
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
-#: ../plugins/hula-account-setup/camel-hula-listener.c:372
-#: ../plugins/hula-account-setup/camel-hula-listener.c:400
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../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
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ç©ºé??/å¿?ç¢?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "é?»è©±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "å?³ç??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Address"
 msgstr "å?°å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "ç¶²èª?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
-#: ../calendar/gui/e-calendar-view.c:2580
-msgid "Birthday"
-msgstr "ç??æ?¥"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../calendar/gui/e-calendar-view.c:2581
-msgid "Anniversary"
-msgstr "é?±å¹´ç´?å¿µæ?¥"
+#. 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
+#: ../mail/e-mail-migrate.c:955
+#: ../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
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:158
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../plugins/email-custom-header/email-custom-header.c:320
+msgid "Personal"
+msgstr "å??äºº"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:853
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "è?·ç¨±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:897
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "Blog"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../widgets/misc/e-web-view.c:750
+#, c-format
+msgid "Click to mail %s"
+msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../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:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "å¾?ç«¯å¿?ç¢?"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../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:62
+#: ../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:63
+#: ../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:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../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:67
+#: ../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:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "é?£çµ¡äºº ID å·²ç¶?å?å?¨"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-cal-model-tasks.c:363
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:661
-#: ../calendar/gui/print.c:2548
+#. 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:223
+#: ../calendar/gui/e-task-table.c:238 ../calendar/gui/e-task-table.c:596
+#: ../calendar/gui/print.c:2608
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../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:72
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "é©?è¨¼å¤±æ??"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../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:74
+#: ../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:76
+#: ../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:77
+#: ../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:78
+#: ../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:79
+#: ../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:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
-msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
-msgstr "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??é??å?¯è?½è¡¨ç¤ºæ¤é??è¨?é??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?ä»¥ä¾?é?¢ç·?ä½¿ç?¨ã??è«?æ?¼ä¸?ç·?æ¨¡å¼?å??æ¬¡è®?å??é??è¨?é??ä»¥ä¸?è¼?å®?ç??å?§å®¹ã??"
+#: ../addressbook/gui/widgets/eab-gui-util.c: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 "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??é??å?¯è?½è¡¨ç¤ºæ¤é??è¨?é??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?ä»¥ä¾?é?¢"
+"ç·?ä½¿ç?¨ã??è«?æ?¼ä¸?ç·?æ¨¡å¼?å??æ¬¡è®?å??é??è¨?é??ä»¥ä¸?è¼?å®?ç??å?§å®¹ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
-msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
-msgstr "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??è«?æª¢æ?¥è·¯å¾? %s æ?¯å?¦å?å?¨è??ä¸?æ¬?é??å·²è¨å®?å?¯ä»¥å?å??å®?ã??"
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??è«?æª¢æ?¥è·¯å¾? %s æ?¯å?¦å?å?¨è??ä¸?æ¬?é??å·²è¨å®?å?¯ä»¥å?å??å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
-msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr "æ¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è¯é?²å?»ã??å¦?æ??æ?¨æ?³å?¨ Evolution ä½¿ç?¨ LDAPï¼?å¿?é ?å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?ä»¶ã??"
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"æ¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è¯é?²å?»ã??å¦?æ??æ?¨æ?³å?¨ Evolution ä½¿ç?¨ LDAPï¼?å¿?é ?"
+"å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?ä»¶ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??é??è¡¨ç¤ºæ?¨è¼¸å?¥é?¯èª¤ç??URIï¼?æ??ä¼ºæ??å?¨ç?¡æ³?é?£ç·?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "è©³ç´°ç??é?¯èª¤è¨?æ?¯:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2440,7 +1585,7 @@ msgstr ""
 "è«?ä½¿ç?¨æ?´å? æ??ç¢ºç??æ?¥è©¢æ??æ?¯æ??é«?æ¤ç?®é??æ??å??ç??ç?®é??\n"
 "ä¼ºæ??å?¨å??å¥½è¨å®?ä¸ç??çµ?æ??é??å?¶ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 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"
@@ -2452,194 +1597,96 @@ msgstr ""
 "æ??æ?¯æ??é«?æ¤ç?®é??æ??å??ç??ç?®é??ä¼ºæ??å?¨å??å¥½è¨å®?ä¸ç??\n"
 "æ??é??ä¸?é??ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "æ¤ç?®é??æ??å??ç??å¾?ç«¯ç¨?å¼?ç?¡æ³?è§£æ??é??æ¬¡ç??æ?¥è©¢ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr "æ¤ç?®é??æ??å??ç??å¾?ç«¯ç¨?å¼?æ??çµ?å?·è¡?é??æ¬¡ç??æ?¥è©¢ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "é??æ¬¡ç??æ?¥è©¢ä¸¦æ?ªå®?å?¨æ??å??ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:685
-msgid "Error adding contact"
-msgstr "æ?°å¢?é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "ç·¨è¼¯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "ä¿®æ?¹é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:635
-msgid "Error removing contact"
-msgstr "ç§»é?¤é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"é??å?? %d å??é?£çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
-"ç¢ºå®?è¦?é¡¯ç¤ºé??å??é?£çµ¡äººï¼?"
-msgstr[1] ""
-"é??å?? %d å??é?£çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
-"ç¢ºå®?è¦?é¡¯ç¤ºé??äº?é?£çµ¡äººï¼?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "ä¸?è¦?é¡¯ç¤º(_D)"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "é¡¯ç¤ºæ??æ??ç??é?£çµ¡äºº(_A)"
-
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s å·²ç¶?å?å?¨\n"
-"æ?¨æ?¯å?¦è¦?è¦?å¯«å®?ï¼?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:354
-msgid "Overwrite"
-msgstr "è¦?å¯«"
-
-#. more than one, finding the total number of contacts might
-#. * hit performance while saving large number of contacts
-#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "å??é?£çµ¡äºº"
-msgstr[1] "å??é?£çµ¡äºº"
-
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:480
+#: ../addressbook/gui/widgets/eab-gui-util.c:244
 msgid "Select Address Book"
 msgstr "é?¸æ??é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "æ¸?å?®"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:746
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Move contact to"
 msgstr "å°?é?£çµ¡äººç§»å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:434
 msgid "Copy contact to"
 msgstr "è¤?è£½é?£çµ¡äººå?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contacts to"
 msgstr "å°?é?£çµ¡äººç§»å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contacts to"
 msgstr "è¤?è£½é?£çµ¡äººå?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "å¤?é?? vCard"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "%s ç?? vCard"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "é?£çµ¡äººè³?è¨?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s ç??é?£çµ¡äººè³?è¨?"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:291
-msgid "Querying Address Book..."
-msgstr "æ£å?¨æ?¥è©¢é??è¨?é??â?¦"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "å??ç??æª¢è¦?æ¨¡å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:512
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../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:687
-#: ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "å?¯å?¥..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:862
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:871
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:880
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP è³?æ??äº¤æ??æ ¼å¼? (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF è¼¸å?¥å?¨"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:556
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcfã??.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:557
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard å?¯å?¥ç¨?å¼?"
 
@@ -2682,49 +1729,86 @@ msgid "Export in asynchronous mode"
 msgstr "å?¨é??å??æ¥æ¨¡å¼?å?¯å?º"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:59
-msgid "The number of cards in one output file in asynchronous mode, default size 100."
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr "é??å??æ¥æ¨¡å¼?ä¸?ï¼?ä¸?å??è¼¸å?ºæª?æ¡?ä¸ç??å??ç??æ?¸ç?®ï¼?é ?è¨å¤§å°?æ?¯ 100ã??"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "æ?¸é??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:99
-msgid "Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/tools/evolution-addressbook-export.c:101
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "æ??ä»¤å??å¼?æ?¸é?¯èª¤ï¼?è«?ä½¿ç?¨ --help é?¸é ?ä¾?æ?¥ç??ç?¨æ³?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "å??æ?¯æ?´ csv æ?? vcard æ ¼å¼?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "å?¨é??å??æ¥æ¨¡å¼?ä¸?ï¼?è¼¸å?ºå¿?é ?æ?¯æª?æ¡?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "å?¨ä¸?è?¬æ¨¡å¼?ä¸?ï¼?ä¸?é??è¦?å¤§å°?é?¸é ?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "æ?ªè??ç??ç??é?¯èª¤"
 
+#: ../addressbook/util/addressbook.c:103
+msgid "Accessing LDAP Server anonymously"
+msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
+
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:525
+msgid "Failed to authenticate.\n"
+msgstr "é©?è?æ??è?å¤±æ??ã??\n"
+
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#, 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:518
+#: ../plugins/publish-calendar/publish-calendar.c:328
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "è¼¸å?¥å¯?ç¢¼"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
-msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¸¦ä¸?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?è¡?äº?æ??æª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??è¡?äº?æ??ã??"
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+"ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¸¦ä¸?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?è¡?äº?æ??æª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??è¡?"
+"äº?æ??ã??"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¾?æº?ã??è«?é?¸å??ä¸?å??è?½å? å?¥ç´?æ??ç??è¡?äº?æ??ã??"
 
 #: ../calendar/calendar.error.xml.h:5
-msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients 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."
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
 msgstr "æ?°å¢?æ??æ??ç¾©ç??æ??è¦?å?°æ?¨ç??å·¥ä½?å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??æ?¨ç??å·¥ä½?å??ä»?éº¼äº?æ??é??ã??"
 
 #: ../calendar/calendar.error.xml.h:7
@@ -2736,7 +1820,9 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤å??å¿?é??ä¸ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on these appointments will be deleted and can not be restored."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr "æ??å?ªé?¤é??äº?ç´?æ??ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -2744,11 +1830,13 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤é??äº?å·¥ä½?ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤ç´?æ??ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤æ??è°ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:13
@@ -2768,540 +1856,475 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤æ¨?é¡?ç?º '{0}' ç??ç´?æ??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "ç¢ºå®?è¦?å?ªé?¤æ¨?é¡?ç?ºã??{0}ã??ç??æ??è°ï¼?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤å??å¿?é?? '{0}'ï¼?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é?? {0} ç´?æ??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é?? {0} å??å??å¿?é??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é?? {0} å·¥ä½?ï¼?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤æ¤ç´?æ??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤æ¤æ??è°ï¼?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤æ¤å??å¿?é??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤æ¤å·¥ä½?ï¼?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "ç¢ºå®?è¦?å?²å?æ²?æ??æ??è¦?ç??å??å¿?é??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "æ?¨ç¢ºå®?è¦?å?³é??æ²?æ??æ??è¦?ç??ç´?æ??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "æ?¨ç¢ºå®?è¦?å?³é??æ²?æ??æ??è¦?ç??å·¥ä½?ï¼?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
 msgstr "è¡?äº?æ??è³?æ??åº«å·²é?¢ç·?ã??"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "ä¸?è?½å»ºç«?æ?°ç??äº?ä»¶"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot save event"
 msgstr "ä¸?è?½å?²å?äº?ä»¶"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete calendar '{0}'?"
 msgstr "å?ªé?¤è¡?äº?æ??ã??{0}ã??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete memo list '{0}'?"
 msgstr "å?ªé?¤å??å¿?é??æ¸?å?®ã??{0}ã??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete task list '{0}'?"
 msgstr "å?ªé?¤å·¥ä½?æ¸?å?®ã??{0}ã??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "ä¸?è¦?å?³é??(_N)"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ä¸?è¼?å°?å?¨é?²è¡?ä¸ã??æ?¨æ?¯å?¦è¦?å?²å?æ¤ç´?æ??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ä¸?è¼?å°?å?¨é?²è¡?ä¸ã??æ?¨æ?¯å?¦è¦?å?²å?æ¤å·¥ä½?ï¼?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "ç?¡æ³?è¼?å?¥ç·¨è¼¯å?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:38
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
+#: ../calendar/calendar.error.xml.h:39
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr "é?»å?é?µä»¶é??è«?æ??å?³é??çµ¦æ??æ??å??è??è??ä¸¦è®?ä»?å??æ?¥å??æ¤å·¥ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:39
-msgid "Email invitations will be sent to all participants and allow them to reply."
+#: ../calendar/calendar.error.xml.h:40
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr "é?»å?é?µä»¶é??è«?å?½æ??å?³é??çµ¦æ??æ??å??è??è??ä¸¦è®?ä»?å??å??è¦?ã??"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "è¼?å?¥è¡?äº?æ??æ??ç?¼ç??é?¯èª¤"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "è¼?å?¥å??å¿?é??æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "è¼?å?¥å·¥ä½?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error on '{0}'"
 msgstr "ã??{0}ã??ç?¼ç??é?¯èª¤"
 
-#: ../calendar/calendar.error.xml.h:45
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+#: ../calendar/calendar.error.xml.h:46
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr "å¦?æ??ä¸?å?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??æ??è°å·²ç¶?å??æ¶?ã??"
 
-#: ../calendar/calendar.error.xml.h:46
-msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
+#: ../calendar/calendar.error.xml.h:47
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??è©²å??å¿?é??å·²ç¶?å?ªé?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:47
-msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+#: ../calendar/calendar.error.xml.h:48
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??å·¥ä½?å·²ç¶?å?ªé?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "ä¼ºæ??å?¨æ²?æ??å??æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "Save Appointment"
-msgstr "å?²å?ç´?æ??"
-
 #: ../calendar/calendar.error.xml.h:50
-msgid "Save Memo"
-msgstr "å?²å?å??å¿?é??"
-
-#: ../calendar/calendar.error.xml.h:51
-msgid "Save Task"
-msgstr "å?²å?å·¥ä½?"
-
-#: ../calendar/calendar.error.xml.h:52
-msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?å??è¨±å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:53
-msgid "Sending updated information allows other participants to keep their task lists up to date."
+#: ../calendar/calendar.error.xml.h:51
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?è®?å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??å·¥ä½?æ¸?å?®ã??"
 
-#: ../calendar/calendar.error.xml.h:55
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+#: ../calendar/calendar.error.xml.h:52
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr "é??è£¡æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??ä»¶ã??å?²å?æ¤ç´?æ??å°?æ??å¤±å?»é??äº?é??ä»¶ã??"
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+#: ../calendar/calendar.error.xml.h:53
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr "é??è£¡æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??ä»¶ã??å?²å?æ¤å·¥ä½?å°?æ??å¤±å?»é??äº?é??ä»¶ã??"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨æ?¨ç?®å??ç??ä¼ºæ??å?¨ç??æ?¬ä¸?æ£å¸¸é??ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution å??å¿?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution å·¥ä½?å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "æ¤è¡?äº?æ??å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "æ¤å??å¿?é??æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "æ¤å·¥ä½?æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "é??å??è¡?äº?æ??å°?æ??è¢«æ°¸é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "é??å??å??å¿?é??æ¸?å?®å°?æ??è¢«æ°¸é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "é??é ?å·¥ä½?æ¸?å?®å°?æ??è¢«æ°¸é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:65
 msgid "Unable to load the calendar"
 msgstr "ç?¡æ³?è¼?å?¥è¡?äº?æ??"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this appointment?"
 msgstr "è¦?å?²å?å°?æ¤ç´?æ??æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to save your changes to this meeting?"
+msgstr "è¦?å?²å?å°?æ¤æ??è°æ??å??ç??è®?æ?´ï¼?"
+
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this memo?"
 msgstr "è¦?å?²å?å°?æ¤å??å¿?é??æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this task?"
 msgstr "è¦?å?²å?å°?æ¤å·¥ä½?æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "æ?¯å?¦è¦?å?³é??æ¤å??å¿?é??ç??å??æ¶?é??ç?¥ï¼?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "è¦?å?³é??å??æ¶?é??ç?¥çµ¦æ??æ??ç??å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "è¦?å?³é??æ??è°é??è«?çµ¦å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send this task to participants?"
 msgstr "è¦?å?³é??æ¤å·¥ä½?çµ¦å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "è¦?å?³é??æ??è°æ?´æ?°è³?è¨?çµ¦å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send updated task information to participants?"
 msgstr "è¦?å?³é??æ?´æ?°ç??å·¥ä½?è³?è¨?çµ¦å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:78
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
-msgstr "æ?¨æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??æ?¬ã??"
+#: ../calendar/calendar.error.xml.h:76
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"æ?¨æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??"
+"è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??æ?¬ã??"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ¤ç´?æ??ï¼?ä½?å°?æ?ªå?²å?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:78
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "æ?¨å·²ç¶?è®?æ?´æ¤æ??è°ï¼?ä½?å°?æ?ªå?²å?å®?ã??"
+
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this task, but not yet saved it."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ¤å·¥ä½?ï¼?ä½?å°?æ?ªå?²å?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ¤å??å¿?é??ï¼?ä½?å°?æ?ªå?²å?å®?å??ã??"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨æ?¨ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨æ?¨ç??å??å¿?é??ã??"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨æ?¨ç??å·¥ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "æ?¾æ£?è®?æ?´(_D)"
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/e-composer-actions.c:343
+#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "å?²å?(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:86
 msgid "_Save Changes"
 msgstr "å?²å?è®?æ?´(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34
-#: ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Send Notice"
 msgstr "å?³é??é??ç?¥(_S)"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:89
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:248
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "å??å?²å¤?æ?¥äº?ä»¶:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1513
-#: ../calendar/conduits/calendar/calendar-conduit.c:1514
-#: ../calendar/conduits/memo/memo-conduit.c:807
-#: ../calendar/conduits/memo/memo-conduit.c:808
-#: ../calendar/conduits/todo/todo-conduit.c:1007
-#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../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 è³?æ??ä¼ºæ??å?¨"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1621
-#: ../calendar/conduits/calendar/calendar-conduit.c:1624
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "ç?¡æ³?è®?å?? pilot è¡?äº?æ??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/memo/memo-conduit.c:901
-#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å??å¿?é??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/memo/memo-conduit.c:948
-#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "ç?¡æ³?å¯«å?¥ pilot å??å¿?é??ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/todo/todo-conduit.c:227
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "é ?è¨å?ªå??é ?åº?:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1091
-#: ../calendar/conduits/todo/todo-conduit.c:1094
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å¾?è¾¦äº?é ?ç¨?å¼?å??å¡?"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1136
-#: ../calendar/conduits/todo/todo-conduit.c:1139
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "ç?¡æ³?è®?å?? pilot å¾?è¾¦äº?é ?ç¨?å¼?å??å¡?"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2549
-msgid "Calendar and Tasks"
-msgstr "è¡?äº?æ??è??å·¥ä½?"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:819
-#: ../calendar/gui/calendar-component.c:1238
-msgid "Calendars"
-msgstr "è¡?äº?æ??"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "å?¨é??è£¡è¨å®?æ?¨ç??æ??å??ã??è¡?äº?æ??è??å·¥ä½?æ¸?å?®"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution è¡?äº?æ??å??å·¥ä½?"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution è¡?äº?æ??çµ?æ??æ?§å?¶"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution è¡?äº?æ??æ??ç¨?è¨?æ?¯æª¢è¦?å?¨"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution è¡?äº?æ??/å·¥ä½?ç·¨è¼¯å?¨"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolution ç??è¡?äº?æ??é??ä»¶"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "Evolution ç??å??å¿?é??å??ä»¶"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Evolution ç??å·¥ä½?é??ä»¶"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "å??å¿?é??(_S)"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293
-#: ../calendar/gui/e-memos.c:1123
-#: ../calendar/gui/gnome-cal.c:1846
-#: ../calendar/gui/memos-component.c:564
-#: ../calendar/gui/memos-component.c:882
-#: ../calendar/gui/memos-control.c:386
-#: ../calendar/gui/memos-control.c:402
-msgid "Memos"
-msgstr "å??å¿?é??"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725
-#: ../calendar/gui/e-tasks.c:1426
-#: ../calendar/gui/gnome-cal.c:1714
-#: ../calendar/gui/print.c:1973
-#: ../calendar/gui/tasks-component.c:557
-#: ../calendar/gui/tasks-component.c:879
-#: ../calendar/gui/tasks-control.c:524
-#: ../calendar/gui/tasks-control.c:540
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:751
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "å·¥ä½?"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "è¡?äº?æ??(_C)"
-
-#. Tasks
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:328
-#: ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "å·¥ä½?(_T)"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution è¡?äº?æ??é¬§é?´é??ç?¥æ??å??"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 msgstr[1] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:449
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../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 ../filter/filter.ui.h:15
+#: ../plugins/caldav/caldav-source.c:496
 #: ../plugins/calendar-file/calendar-file.c:294
 #: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:741
+#: ../plugins/calendar-weather/calendar-weather.c:517
 #: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-source.c:740
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "å?¨é?¨è§£é?¤(_A)"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
-#: ../calendar/gui/e-itip-control.c:1164
-#: ../plugins/itip-formatter/itip-view.c:1023
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1574
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Location:"
 msgstr "ä½?ç½®:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "å¿½ç?¥æ??é??(_T):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "è§£é?¤(_D)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1038
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:167
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../ui/evolution-addressbook.xml.h:51
-#: ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:42
-#: ../widgets/menus/gal-define-views.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:151
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1605
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "å»¶æ??(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "ç´?æ??ç??å?°é»?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1441
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1565
+#: ../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 ../filter/filter.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/caldav/caldav-source.c:495
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:516
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/google-account-setup/google-source.c:739
+msgid "minutes"
+msgstr "å??é??"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1435
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1557
 msgid "No summary available."
 msgstr "æ²?æ??å?¯ç?¨ç??æ??è¦?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1450
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1452
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1444
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1446
 msgid "No description available."
 msgstr "æ²?æ??ä»»ä½?æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
 msgid "No location information available."
 msgstr "æ²?æ??å?¯ç?¨ç??å?°é»?è³?è¨?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
 #, c-format
 msgid "You have %d alarms"
 msgstr "æ?¨æ?? %d å??é¬§é?´"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1665
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3313,10 +2336,11 @@ msgstr ""
 "é??å?ºé?»å?é?µä»¶ã??  Evolution æ??é¡¯ç¤º\n"
 "æ?®é??ç??æ??é??å°?è©±ç??ä¾?ä»£æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3329,25 +2353,16 @@ msgstr ""
 "\n"
 "æ?¨ç¢ºå®?è¦?å?·è¡?é??å??ç¨?å¼?ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1713
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??è©¢å??æ??é??æ?¼é??å??ç¨?å¼?ã??"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "ç?¡æ³?å??å§?å?? Bonobo"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid "Could not create the alarm notify service factory, maybe it's already running..."
-msgstr "ç?¡æ³?å»ºç«?è?²é?³æ??é??æ??å??å??ä»¶å·¥å» ï¼?ä¹?è¨±å®?å·²ç¶?å?¨å?·è¡?ä¸..."
-
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "å¤±æ??æ??é??"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69
-#: ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -3356,8 +2371,7 @@ msgstr[0] "%d æ??"
 msgstr[1] "%d æ??"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75
-#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -3368,8 +2382,7 @@ msgstr[1] "%d å??"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -3382,7 +2395,7 @@ msgid "Alarm programs"
 msgstr "é¬§é?´ç¨?å¼?"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "é?¯èª¤è¨?æ?¯å?¨ç??æ??å??ä¸é¡¯ç¤ºç??æ??é??(ç§?)ã??"
 
@@ -3407,7 +2420,8 @@ msgid "Check this to use system timezone in Evolution."
 msgstr "æ ¸å??æ¤é?¸é ?æ??å?¨ Evolution ä¸ä½¿ç?¨ç³»çµ±æ??å??ã??"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "å?¨æ??å?»å??ä¸ç?¨ä¾?ç¹ªè£½ Marcus Bains ç·?ç??è?²å½©(ç??ç©ºè¡¨ç¤ºä½¿ç?¨é ?è¨å?¼)ã??"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
@@ -3495,550 +2509,453 @@ 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
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?ä¸é¡¯ç¤ºå??å¿?é??é ?è¦½çª?æ ¼ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?ä¸é¡¯ç¤ºå·¥ä½?é ?è¦½çª?æ ¼ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "å?¨ã??æ?¥ã??å??ã??å·¥ä½?é?±ã??æª¢è¦?ä¸é¡¯ç¤ºé??é??ï¼?ä»¥å??é??è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
 msgstr "ä¸?æ¬¡é¬§é?´æ??å?»"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "æ??è¨?é??ç??é?µä»¶ç?ç´?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of recently used second time zones in a Day View."
 msgstr "æ??è¿?å?¨æ?¥æª¢è¦?ä¸ä½¿ç?¨ç??ç¬¬äº?æ??å??æ¸?å?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "List of server URLs for free/busy publishing."
 msgstr "ç?¨æ?¼ç©ºé??/å¿?ç¢?ç?¼ä½?ç??ä¼ºæ??å?¨ URL æ¸?å?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains ç·?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains ç·?è?²å½©â??æ?¥æª¢è¦?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains ç·?è?²å½©â??æ??å?»å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
-msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+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:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
 msgstr "è¦?è¨?ä½?ç??æ??è¿?ä½¿ç?¨æ??å??æ?¸ç?®ç??æ??å¤§å?¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+msgid "Memo layout style"
+msgstr "å??å¿?é??é??ç½®æ?¹å¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (horizontal)"
+msgstr "å??å¿?é??é ?è¦½çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+msgid "Memo preview pane position (vertical)"
+msgstr "å??å¿?é??é ?è¦½çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "å·¥ä½?æ?¥çµ?æ??å??é??ï¼?0 å?° 59ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "å·¥ä½?æ?¥é??å§?å??é??ï¼?0 å?° 59ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view horizontal pane position"
 msgstr "æ??æª¢è¦?ç??æ°´å¹³çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Month view vertical pane position"
 msgstr "æ??æª¢è¦?ç??å??ç?´çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining a default reminder."
 msgstr "æ±ºå®?é ?è¨æ??é??ç??å?®ä½?æ?¸ç?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Number of units for determining when to hide tasks."
 msgstr "æ±ºå®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?æ?¸ç?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Overdue tasks color"
 msgstr "é??æ??ç??å·¥ä½?è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
-msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
-msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨è¡?äº?æ??æ¸?å?®è??æ?¥æ??å°?è¦½è¡?äº?æ??ä¹?é??ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr "æ?¹å??ç?ºå??ç?´æ??å??å¿?é??é ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
-msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨å·¥ä½?æ¸?å?®è??å·¥ä½?é ?è¦½çª?æ ¼ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr "æ?¹å??ç?ºæ°´å¹³æ??å·¥ä½?é ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Position of the task preview pane when oriented vertically."
+msgstr "æ?¹å??ç?ºå??ç?´æ??å·¥ä½?é ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
-msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨è¡?äº?æ??æ¸?å?®è??æ?¥æ??å°?è¦½è¡?äº?æ??ä¹?é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../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 in the month view, in pixels."
+msgstr ""
+"å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary calendar"
 msgstr "ä¸»è¦?è¡?äº?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary memo list"
 msgstr "ä¸»è¦?å??å¿?é??æ¸?å?®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Primary task list"
 msgstr "ä¸»è¦?å·¥ä½?æ¸?å?®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Programs that are allowed to be run by alarms."
 msgstr "ç?¨ä¾?å??ç?ºé¬§é?´è??å?·è¡?ç??ç¨?å¼?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Recently used second time zones in a Day View"
 msgstr "æ??è¿?å?¨æ?¥æª¢è¦?ä¸ä½¿ç?¨ç??ç¬¬äº?æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
 msgstr "å?²å?é¬§é?´é?³æ??æª?ç?®é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Scroll Month View by a week"
 msgstr "ä»¥é?±ç?ºå?®ä½?æ?²å??æ??æª¢è¦?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º è§?è?² æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show appointment end times in week and month views"
 msgstr "å?¨é?±å??æ??ç??æª¢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "å?¨äº?ä»¶/æ??è°/å·¥ä½?ç·¨è¼¯å?¨ä¸é¡¯ç¤º å??é¡? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
 msgstr "å?¨é??ç?¥å??ä¸é¡¯ç¤ºé¬§é?´ç?«é?¢"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Show the \"Preview\" pane"
-msgstr "é¡¯ç¤ºã??é ?è¦½ã??çª?æ ¼"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr "é¡¯ç¤ºå??å¿?é??é ?è¦½çª?æ ¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show the \"Preview\" pane."
-msgstr "é¡¯ç¤ºã??é ?è¦½ã??çª?æ ¼ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "é¡¯ç¤ºå·¥ä½?é ?è¦½çª?æ ¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
 msgstr "å?¨äº?ä»¶/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º æ??å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show type field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º é¡?å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../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:71
+#: ../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:72
-msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
-msgstr "å¦?æ??è¨å®?å??æ??å?¨æ?¥æª¢è¦?ä¸é¡¯ç¤ºç¬¬äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??è¨å®?é?µç??ç?¨æ³?ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"å¦?æ??è¨å®?å??æ??å?¨æ?¥æª¢è¦?ä¸é¡¯ç¤ºç¬¬äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??è¨å®?é?µç??ç?¨æ³?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task layout style"
+msgstr "å·¥ä½?é??ç½®æ?¹å¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (horizontal)"
+msgstr "å·¥ä½?é ?è¦½çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Task preview pane position (vertical)"
+msgstr "å·¥ä½?é ?è¦½çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Tasks due today color"
 msgstr "ä»?å¤©å?°æ??å·¥ä½?ç??è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Tasks vertical pane position"
-msgstr "å·¥ä½?å??ç?´çª?æ ¼ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??ç¶²å??ç¯?æ?¬ï¼?%u è¦?ä»¥é?»å?é?µä»¶ä½?å??ç??ä½¿ç?¨è??å??ç¨±é?¨å??ä¾?å??ä»£ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??ç¨±ã??"
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??ç¶²å??ç¯?æ?¬ï¼?%u è¦?ä»¥é?»å?é?µä»¶ä½?å??ç??ä½¿ç?¨è??å??ç¨±é?¨å??ä¾?å??"
+"ä»£ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??ç¨±ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
-msgstr "ç?¨æ?¼è¡?äº?æ??ä¸æ?¥æ??è??æ??å?»ç??é ?è¨æ??å??ï¼?æ?ªç¿»è¯ç?? Olsen æ??å??è³?æ??åº«ä½?ç½®å°±å?? \"America/New York\"ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"ç?¨æ?¼è¡?äº?æ??ä¸æ?¥æ??è??æ??å?»ç??é ?è¨æ??å??ï¼?æ?ªç¿»è¯ç?? Olsen æ??å??è³?æ??åº«ä½?ç½®å°±å?? "
+"\"America/New York\"ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+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ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®æ??é??ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+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ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®æ??é??ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
 msgstr "ç?¨æ?¼æ?¥æª¢è¦?ç??ç¬¬äº?æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+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:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
 msgstr "æ??é??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
 msgstr "ä¸?æ¬¡é¬§é?´å?·è¡?ç??æ??é??(_T)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Timezone"
 msgstr "æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
-msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
-msgstr "è¡?äº?æ??æª¢è¦?ä¸ç??äº?ä»¶é??æ??å??æ??æ??ï¼?æ?¸å?¼ä»?æ?¼ 0 (å®?å?¨é??æ??)å?° 10 (ä¸?é??æ??)ä¹?é??ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+"è¡?äº?æ??æª¢è¦?ä¸ç??äº?ä»¶é??æ??å??æ??æ??ï¼?æ?¸å?¼ä»?æ?¼ 0 (å®?å?¨é??æ??)å?° 10 (ä¸?é??æ??)ä¹?é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
 msgstr "24 å°?æ??å?¶æ ¼å¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "çª?é¡¯ç??(ã??ä¸»è¦?ã??)è¡?äº?æ??ç?? URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "çª?é¡¯ç??(ã??ä¸»è¦?ã??)å??å¿?é??æ¸?å?®ç?? URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "çª?é¡¯ç??(ã??ä¸»è¦?ã??)å·¥ä½?æ¸?å?®ç?? URI"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "é ?è¨æ??é??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "æ±ºå®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"æ±ºå®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use system timezone"
 msgstr "ä½¿ç?¨ç³»çµ±æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr "ä½¿ç?¨ç³»çµ±æ??å??å??ä»£å?¨ Evolution ä¸é?¸å??ç??æ??å??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+msgid "Vertical pane position"
+msgstr "å??ç?´çª?æ ¼ä½?ç½®"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Week start"
 msgstr "ä¸?é?±é??å§?æ?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "æ¯?é?±ç??é??å§?ï¼?å¾?æ??æ??æ?¥ (0) å?°æ??æ??å? (6)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥å??é¡¯ç¤ºé¬§é?´ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "å?ªé?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?ç¢ºèª?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "æ¸?é?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?ç¢ºèª?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+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:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "æ?¯å?¦å?¨é?±å??æ??ç??æª¢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "æ?¯å?¦å?¨è¡?äº?æ??ä¸ç¹ªå?º Marcus Bains ç·?ï¼?ä»£è¡¨ç?®å??æ??å?»ç??ç?´ç·?ï¼?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "æ?¯å?¦å?¨å·¥ä½?æª¢è¦?ä¸é?±è??å®?æ??ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "æ?¯å?¦ä»¥é?±ç?ºå?®ä½?æ?²å??æ??æª¢è¦?ï¼?è??é??ä»¥æ??ç?ºå?®ä½?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to set a default reminder for appointments."
 msgstr "æ?¯å?¦è¨å®?ç´?æ??ç??é ?è¨æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º è§?è?² æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+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:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º æ??å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º é¡?å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../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:112
+#: ../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:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Work days"
 msgstr "å·¥ä½?æ?¥"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end hour"
 msgstr "å·¥ä½?æ?¥çµ?æ??å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday end minute"
 msgstr "å·¥ä½?æ?¥çµ?æ??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start hour"
 msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
 msgid "Workday start minute"
 msgstr "å·¥ä½?æ?¥é??å§?å??é??"
 
-#: ../calendar/gui/cal-editor-utils.c:100
+#: ../calendar/gui/cal-editor-utils.c:102
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
-#: ../calendar/gui/cal-search-bar.c:74
-msgid "Summary contains"
-msgstr "ä¸»æ?¨å??å?«"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Description contains"
-msgstr "æ??è¿°å??å?«"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Category is"
-msgstr "å??é¡?ç?º"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Comment contains"
-msgstr "å??è¨»å??å?«"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Location contains"
-msgstr "ä½?ç½®å??å?«"
-
-#: ../calendar/gui/cal-search-bar.c:636
-msgid "Next 7 Days' Tasks"
-msgstr "æ?ªä¾? 7 å¤©ç??å·¥ä½?"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Active Tasks"
-msgstr "é?²è¡?ä¸ç??å·¥ä½?"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Overdue Tasks"
-msgstr "é??æ??ç??å·¥ä½?"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Completed Tasks"
-msgstr "å·²å®?æ??ç??å·¥ä½? "
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Tasks with Attachments"
-msgstr "æ??é??å? æª?æ¡?ç??å·¥ä½?"
-
-#: ../calendar/gui/cal-search-bar.c:698
-msgid "Active Appointments"
-msgstr "é?²è¡?ä¸ç??ç´?æ??"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Next 7 Days' Appointments"
-msgstr "æ?ªä¾? 7 å¤©ç??ç´?æ??(_P)"
-
-# zh_HK: msgstr "æ??å?°"
-#: ../calendar/gui/calendar-commands.c:89
-#: ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:71
-#: ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "å??å?°"
-
-#: ../calendar/gui/calendar-commands.c:331
-msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
-msgstr "æ¤ä½?æ¥æ??æ°¸ä¹?æ?§å?ªé?¤æ¯?é?¸å??æ??é??é??è??ç??æ??æ??äº?ä»¶ã??å¦?æ??æ?¨ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?äº?ä»¶ã??"
-
-#: ../calendar/gui/calendar-commands.c:337
-msgid "Purge events older than"
-msgstr "æ¸?é?¤æ?©æ?¼é??æ®µæ??é??ç??äº?ä»¶"
-
-#: ../calendar/gui/calendar-commands.c:342
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:295
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:742
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "å¤©"
-
-#. Create the Webcal source group
-#: ../calendar/gui/calendar-component.c:194
-#: ../calendar/gui/memos-component.c:152
-#: ../calendar/gui/migration.c:504
-#: ../calendar/gui/migration.c:603
-#: ../calendar/gui/migration.c:1117
-#: ../calendar/gui/tasks-component.c:149
-msgid "On The Web"
-msgstr "å?¨ç¶²ç«?ä¸?"
-
-#: ../calendar/gui/calendar-component.c:195
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "å¤©æ°£"
-
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:289
-#: ../calendar/gui/calendar-component.c:291
-#: ../calendar/gui/migration.c:398
-msgid "Birthdays & Anniversaries"
-msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
-
-#: ../calendar/gui/calendar-component.c:626
-msgid "_New Calendar"
-msgstr "æ?°å¢?è¡?äº?æ??(_N)"
-
-#: ../calendar/gui/calendar-component.c:627
-#: ../calendar/gui/memos-component.c:478
-#: ../calendar/gui/tasks-component.c:471
-#: ../mail/em-folder-tree.c:2114
-msgid "_Copy..."
-msgstr "è¤?è£½(_C)..."
-
-#: ../calendar/gui/calendar-component.c:632
-#: ../calendar/gui/memos-component.c:483
-#: ../calendar/gui/tasks-component.c:476
-msgid "_Make available for offline use"
-msgstr "æ¨?è¨?ç?ºä¾?é?¢ç·?ä½¿ç?¨(_M)"
-
-#: ../calendar/gui/calendar-component.c:633
-#: ../calendar/gui/memos-component.c:484
-#: ../calendar/gui/tasks-component.c:477
-msgid "_Do not make available for offline use"
-msgstr "ä¸?å??è¨±æ¤é ?å?¨é?¢ç·?ç??æ??ä½¿ç?¨(_D)"
-
-#: ../calendar/gui/calendar-component.c:961
-msgid "Failed upgrading calendars."
-msgstr "å??ç´?è¡?äº?æ??å¤±æ??ã??"
-
-#: ../calendar/gui/calendar-component.c:1089
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s' ä¾?å»ºç«?äº?ä»¶å??æ??è°"
-
-#: ../calendar/gui/calendar-component.c:1105
-msgid "There is no calendar available for creating events and meetings"
-msgstr "æ²?æ??è¡?äº?æ??å?¯ç?¨ä¾?å»ºç«?äº?ä»¶å??æ??è°"
-
-#: ../calendar/gui/calendar-component.c:1218
-msgid "Calendar Source Selector"
-msgstr "è¡?äº?æ??ä¾?æº?é?¸æ??å?¨"
-
-#: ../calendar/gui/calendar-component.c:1433
-msgid "New appointment"
-msgstr "æ?°å¢?ç´?æ??"
-
-#: ../calendar/gui/calendar-component.c:1434
-msgctxt "New"
-msgid "_Appointment"
-msgstr "ç´?æ??(_A)"
-
-#: ../calendar/gui/calendar-component.c:1435
-msgid "Create a new appointment"
-msgstr "å»ºç«?ä¸?å??æ?°ç??ç´?æ??"
-
-#: ../calendar/gui/calendar-component.c:1441
-msgid "New meeting"
-msgstr "æ?°å¢?æ??è°"
-
-#: ../calendar/gui/calendar-component.c:1442
-msgctxt "New"
-msgid "M_eeting"
-msgstr "æ??è°(_E)"
-
-#: ../calendar/gui/calendar-component.c:1443
-msgid "Create a new meeting request"
-msgstr "å»ºç«?æ?°æ??è°è¦?æ±?"
-
-#: ../calendar/gui/calendar-component.c:1449
-msgid "New all day appointment"
-msgstr "æ?°ç??å?¨æ?¥ç´?æ??"
-
-#: ../calendar/gui/calendar-component.c:1450
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "å?¨æ?¥ç´?æ??(_P)"
-
-#: ../calendar/gui/calendar-component.c:1451
-msgid "Create a new all-day appointment"
-msgstr "å»ºç«?æ?°ç??å?¨æ?¥ç´?æ??"
-
-#: ../calendar/gui/calendar-component.c:1457
-msgid "New calendar"
-msgstr "æ?°è¡?äº?æ??"
-
-#: ../calendar/gui/calendar-component.c:1458
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "è¡?äº?æ??(_N)"
-
-#: ../calendar/gui/calendar-component.c:1459
-msgid "Create a new calendar"
-msgstr "å»ºç«?æ?°è¡?äº?æ??"
-
 #: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "æ?¥æª¢è¦?"
@@ -4055,18 +2972,15 @@ msgstr "é?±æª¢è¦?"
 msgid "Month View"
 msgstr "æ??æª¢è¦?"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "ä»»ä½?æ¬?ä½?"
 
-#: ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
-msgstr "é??å? æª?æ¡?"
+msgstr "é??ä»¶"
 
 #: ../calendar/gui/caltypes.xml.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -4074,613 +2988,554 @@ msgstr "é??å? æª?æ¡?"
 msgid "Attendee"
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/caltypes.xml.h:5
-#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "æ¸é¡?"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:370
-#: ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-task-table.c:500
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../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/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°:"
 
-#: ../calendar/gui/caltypes.xml.h:9
-#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-#: ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "ä¸?å?å?¨"
 
-#: ../calendar/gui/caltypes.xml.h:11
-#: ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "å?å?¨"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:722
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../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:368
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "æ??è°å?¬é??äºº"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:368
-#: ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-task-table.c:499
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ç§?äºº"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:359
-#: ../calendar/gui/e-cal-model.c:366
-#: ../calendar/gui/e-calendar-table.c:563
-#: ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
+#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../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-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:354
 msgid "Summary"
 msgstr "æ??è¦?"
 
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "æ??è¦?å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25
-#: ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26
-#: ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "ä¸?å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27
-#: ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "æ?¯"
 
-#: ../calendar/gui/caltypes.xml.h:22
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ä¸?æ?¯"
 
-#: ../calendar/gui/comp-editor-factory.c:408
-msgid "Error while opening the calendar"
-msgstr "é??å??è¡?äº?æ??æ??ç?¼ç??é?¯èª¤"
-
-#: ../calendar/gui/comp-editor-factory.c:414
-msgid "Method not supported when opening the calendar"
-msgstr "é??å??è¡?äº?æ??æ??ä¸?æ?¯æ?´æ?¹æ³?"
-
-#: ../calendar/gui/comp-editor-factory.c:420
-msgid "Permission denied to open the calendar"
-msgstr "æ²?æ??é??å??è¡?äº?æ??ç??æ¬?é??"
-
-#: ../calendar/gui/comp-editor-factory.c:438
-#: ../shell/e-shell.c:1261
-msgid "Unknown error"
-msgstr "ä¸?æ??ç??é?¯èª¤"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:611
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "ç·¨è¼¯é¬§é?´"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "é¡¯ç¤ºæ??ç¤º"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "æ?æ?¾é?³æ??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "å?·è¡?å¤?é?¨ç¨?å¼?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "å?³é??é?»å?é?µä»¶"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>é¬§é?´</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>é?¸é ?</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>é??è¤?</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "æ?°å¢?é¬§é?´"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Alarm"
+msgstr "é¬§é?´"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "è?ªè¨?è¨?æ?¯(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "è?ªè¨?é¬§é?´è?²é?³"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "è¨?æ?¯(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+msgid "Options"
+msgstr "é?¸é ?"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "é??è¤?"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "è«?é?¸å??æª?æ¡?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "æ?¶ä»¶è??ï¼?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "å¼?æ?¸(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "å?·è¡?ç¨?å¼?(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "é??è¤?é¬§é?´(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "è?²é?³(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-msgid ""
-"before\n"
-"after"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#, fuzzy
+msgid "after"
+msgstr "ä¹?å¾?(_A):"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#, fuzzy
+msgid "before"
 msgstr ""
 "ä¹?å??\n"
 "ä¹?å¾?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+msgid "day(s)"
+msgstr "å¤©"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../filter/filter.ui.h:14
+#: ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/caldav/caldav-source.c:497
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:518
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "days"
+msgstr "å¤©"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+msgid "end of appointment"
+msgstr "ç´?æ??çµ?æ??"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "æ??é??é??é??æ¯?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-msgid ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
-msgstr ""
-"å??é??\n"
-"å°?æ??\n"
-"æ?¥"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+msgid "hour(s)"
+msgstr "å°?æ??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-msgid ""
-"minutes\n"
-"hours\n"
-"days"
-msgstr ""
-"å??é??\n"
-"å°?æ??\n"
-"æ?¥"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "minute(s)"
+msgstr "å??é??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid ""
-"start of appointment\n"
-"end of appointment"
-msgstr ""
-"ç´?æ??é??å§?\n"
-"ç´?æ??çµ?æ??"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "start of appointment"
+msgstr "ç´?æ??é??å§?"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "å??ä½?/è§¸ç?¼"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "å? å?¥(_A)"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../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
 msgid "Alarms"
 msgstr "é¬§é?´"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
-msgid "_Suggest automatic display of attachment"
-msgstr "å»ºè°è?ªå??é¡¯ç¤ºé??ä»¶(_S)"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
-msgid "Attach file(s)"
-msgstr "é??å? æª?æ¡?"
-
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/event-page.c:2993
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-day-view-time-item.c:785
-#: ../calendar/gui/e-itip-control.c:1150
-#: ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:717
-#: ../mail/em-account-editor.c:1451
-#: ../mail/em-account-prefs.c:435
-#: ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:394
-#: ../plugins/exchange-operations/exchange-delegates-user.c:179
-#: ../plugins/itip-formatter/itip-formatter.c:2208
-#: ../widgets/misc/e-cell-date-edit.c:312
-#: ../widgets/misc/e-dateedit.c:1463
-#: ../widgets/misc/e-dateedit.c:1674
-#: ../widgets/misc/e-signature-combo-box.c:74
+#. 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/e-day-view-time-item.c:797
+msgctxt "cal-second-zone"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
+#: ../calendar/gui/e-timezone-entry.c:319
+msgid "Select..."
+msgstr "é?¸æ??..."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
 msgid "Selected Calendars for Alarms"
 msgstr "é?¸æ??é¬§é?´è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
 msgid "Time and date:"
 msgstr "æ??å?»å??æ?¥æ??ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
 msgid "Date only:"
 msgstr "å?ªæ??æ?¥æ??ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u è?? %d æ??è¢«æ?¿æ??ç?ºé?»å?é?µä»¶ä½?å??ä¸ç??ä½¿ç?¨è??è??ç¶²å??å??ç¨±ã??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
 msgstr "(é¡¯ç¤ºæ?¼æ?¥æª¢è¦?)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 å??é??\n"
-"30 å??é??\n"
-"15 å??é??\n"
-"10 å??é??\n"
-"05 å??é??"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+msgid "05 minutes"
+msgstr "05 å??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u è?? %d æ??è¢«æ?¿æ??ç?ºé?»å?é?µä»¶ä½?å??ä¸ç??ä½¿ç?¨è??è??ç¶²å??å??ç¨±ã??</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<span weight=\"bold\">Alarms</span>"
-msgstr "<span weight=\"bold\">é¬§é?´</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">è¦å??</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Date/Time Format</span>"
-msgstr "<span weight=\"bold\">æ?¥æ??/æ??é??æ ¼å¼?</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">é ?è¨ç©ºé??/å¿?ç¢?ä¼ºæ??å?¨</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">ä¸?è?¬</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">å·¥ä½?æ¸?å?®</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">æ??é??</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">å·¥ä½?é?±</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+msgid "10 minutes"
+msgstr "10 å??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+msgid "15 minutes"
+msgstr "15 å??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+msgid "30 minutes"
+msgstr "30 å??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+msgid "60 minutes"
+msgstr "60 å??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+msgid "Alerts"
+msgstr "è¦ç¤º"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "æ?¥æ??/æ??å?»æ ¼å¼?"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "ä¸?æ?¥çµ?æ??æ?¼(_E):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+msgid "Days"
+msgstr "å¤©"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "é ?è¨ç??ç©ºé??/å¿?ç¢?ä¼ºæ??å?¨ç¶²å??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "é¡¯ç¤º"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
 msgid "Display alarms in _notification area only"
 msgstr "å?ªå?¨é??ç?¥å??å??ä¸é¡¯ç¤ºé¬§é?´(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"å??é??\n"
-"å°?æ??\n"
-"æ?¥"
+#: ../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:2653
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "General"
+msgstr "ä¸?è?¬"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+msgid "Hours"
+msgstr "å°?æ??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+msgid "Minutes"
+msgstr "å??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"æ??æ??ä¸?\n"
-"æ??æ??äº?\n"
-"æ??æ??ä¸?\n"
-"æ??æ??å??\n"
-"æ??æ??äº?\n"
-"æ??æ??å?\n"
-"æ??æ??æ?¥"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:118
+#. 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:745 ../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
 msgid "Pick a color"
 msgstr "æ??é?¸é¡?è?²"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "é?±æ?¥(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "æ??æ??å?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "ä»¥é?±æ?²å??æ??æª¢è¦?(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "ç¬¬äº?æ??å??(_C):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "é?¸æ??é¬§é?´é??ç?¥ç??è¡?äº?æ??"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
 msgstr "é¡¯ç¤ºæ??é??æ?¼ç´?æ??(_O)"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
 msgstr "é¡¯ç¤ºæ??é??(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "å?¨æ?¥æ??å°?è¦½é¡¯ç¤ºé?±æ?¸(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../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.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "T_asks due today:"
 msgstr "ä»?å¤©å?°æ??ç??å·¥ä½?(_A):"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
 msgstr "é?±å??(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "å·¥ä½?æ¸?å?®"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "Template:"
 msgstr "æ¨£æ?¿:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:613
+msgid "Time"
+msgstr "æ??é??"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "æ??å??(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "æ??å?»æ ¼å¼?:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Use s_ystem time zone"
 msgstr "ä½¿ç?¨ç³»çµ±æ??å??(_Y)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
 msgstr "ä¸?é?±é??å§?æ?¼(_K):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+msgid "Work Week"
+msgstr "å·¥ä½?é?±"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Work days:"
 msgstr "å·¥ä½?æ?¥:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 å°?æ?? (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "_24 hour"
 msgstr "_24 å°?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??ç¢ºèª?(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_Compress weekends in month view"
 msgstr "å?¨æ??æª¢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
 msgstr "ä¸?æ?¥é??å§?æ?¼(_D):"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
 msgstr "é?±äº?(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Hide completed tasks after"
 msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?(_H)"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
 msgstr "é?±ä¸?(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
 msgstr "é??æ??ç??å·¥ä½?(_O):"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
 msgstr "é?±å?(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "å?¨é?±å??æ??ç??æª¢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
 msgstr "æ??é??é??é??(_T):"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
 msgstr "é?±äº?(_T)"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
 msgstr "é?±ä¸?(_W)"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
 msgstr "å?¨æ¯?å??é?±å¹´ç´?å¿µæ?¥/ç??æ?¥ä¹?å??"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "before every appointment"
 msgstr "å??"
 
@@ -4688,6 +3543,19 @@ msgstr "å??"
 msgid "Type:"
 msgstr "é¡?å??:"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:500
+msgid "_Type:"
+msgstr "é¡?å??(_T):"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../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
+msgid "_Name:"
+msgstr "å??ç¨±(_N):"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "è¤?è£½è¡?äº?æ??å?§å®¹è?³æ?¬å?°ä»¥ä¾¿é?¢ç·?ä½?æ¥(_Y)"
@@ -4704,10 +3572,6 @@ msgstr "è¤?è£½å??å¿?é??æ¸?å?®å?§å®¹è?³æ?¬å?°ä»¥ä¾¿é?¢ç·?ä½?æ¥(_Y)"
 msgid "Colo_r:"
 msgstr "é¡?è?²(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "å·¥ä½?æ¸?å?®"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "å??å¿?é??æ¸?å?®"
@@ -4785,248 +3649,251 @@ msgstr "%s  æ?¨æ²?æ??å??ä»»ä½?è®?æ?´ï¼?æ?´æ?°é??å??ç·¨è¼¯å?¨ï¼?"
 msgid "Validation error: %s"
 msgstr "ç¢ºèª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189
-#: ../calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2380
 msgid " to "
 msgstr " å?° "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193
-#: ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2384
 msgid " (Completed "
 msgstr " (å·²å®?æ??) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195
-#: ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2386
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200
-#: ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2391
 msgid " (Due "
 msgstr "(æ??é??)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202
-#: ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2393
 msgid "Due "
 msgstr "æ??é?? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:224
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "ç?¡æ³?å?²å?é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:509
 msgid "Could not update object"
 msgstr "ç?¡æ³?æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "ç·¨è¼¯ç´?æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "æ??è° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:591
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "ç´?æ?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:597
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "æ??æ´¾ç??å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:599
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "å??å¿?é?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "æ²?æ??æ??è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "æ?¯å?¦ä¿?æ??å??å§?é ?ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "æ??é??è£¡ä»¥é??é??ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
-msgid "Copy selected text to the clipboard"
-msgstr "è¤?è£½é?¸å??ç??æ??å?è?³å?ªè²¼ç°¿"
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1444
+#: ../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
+msgid "Copy the selection"
+msgstr "è¤?è£½é?¸å??ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:982
-msgid "Cut selected text to the clipboard"
-msgstr "å?ªä¸?é?¸å??ç??æ??å?è?³å?ªè²¼ç°¿"
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1451
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:959
+msgid "Cut the selection"
+msgstr "å?ªä¸?é?¸å??ç¯?å??"
+
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1458
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+msgid "Delete the selection"
+msgstr "å?ªé?¤é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:989
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "æ??é??è£¡ä»¥æª¢è¦?å?¯ç?¨ç??èªªæ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:996
-msgid "Paste text from the clipboard"
-msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?æ??å?"
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1493
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:971
+msgid "Paste the clipboard"
+msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1017
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "æ??é??è£¡ä»¥å?²å?ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1024
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1563
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "é?¸å??æ??æ??æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1031
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "æ¸é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1045
-#: ../mail/mail-signature-editor.c:209
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1612
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "æª?æ¡?(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1052
-#: ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1043
 msgid "_Options"
 msgstr "é?¸é ?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
-#: ../mail/em-folder-tree.c:2106
-#: ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1654
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "é??ä»¶(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
-msgstr "æ??é??è£¡ä»¥é??å? æª?æ¡?"
+msgstr "æ??é??è£¡ä»¥é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "å??é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å??é¡?ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "æ??å??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??æ??å??ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "å?¬é??(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "å??é¡?ç?ºå?¬é??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "ç§?äºº(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "æ¸é¡?ç?ºç§?äºº"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "æ©?å¯?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "æ¸é¡?ç?ºæ©?å¯?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "è§?è?²æ¬?ä½?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??è§?è?²ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??RSVPã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "ç??æ??æ¬?ä½?(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??ç??æ??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "é¡?å??æ¬?ä½?(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å?°æ??è??é¡?å??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
-#: ../composer/e-composer-private.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "æ??è¿?ä½¿ç?¨æ??ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../composer/e-composer-actions.c:518
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "é??å? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "å?²å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1924
-#: ../calendar/gui/dialogs/comp-editor.c:1973
-#: ../calendar/gui/dialogs/comp-editor.c:2833
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2955
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ??æ?°ç??æ?´æ?°ï¼?å??æ??æ?¾æ£?å°?æ¤é ?ç?®æ??å??ç??è®?æ?´"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2801
-#: ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2862
+#: ../calendar/gui/dialogs/comp-editor.c:2985
 msgid "Unable to use current version!"
 msgstr "ç?¡æ³?ä½¿ç?¨ç?®å??ç??ç??æ?¬ï¼?"
 
@@ -5042,7 +3909,7 @@ msgstr "ç?¡æ³?é??å??ç?®ç??å?°"
 msgid "Destination is read only"
 msgstr "ç?®ç??å?°æ?¯å?¯è®?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "æ?¯å?¦å?ªé?¤å?¶ä»?æ??æ??æ?¶ä»¶è??ä¿¡ç®±ä¸ç??é??å??é ?ç?®(_D)ï¼?"
 
@@ -5094,159 +3961,145 @@ msgstr "ç?±æ?¼é?¯èª¤ï¼?æ??ä»¥ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
 msgid "The item could not be deleted due to an error"
 msgstr "ç?±æ?¼é?¯èª¤ï¼?æ??ä»¥ç?¡æ³?å?ªé?¤é ?ç?®ã??"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "é?£çµ¡äºº..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:416
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "å§?è¨?çµ¦ï¼?"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "è¼¸å?¥ä»£è¡¨"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Alarms"
 msgstr "é¬§é?´(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Click here to set or unset alarms for this event"
 msgstr "æ??é??è£¡ä»¥è¨å®?æ??å??æ¶?é??å??äº?ä»¶ç??é¬§é?´"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 msgid "_Recurrence"
 msgstr "é?±æ??æ?§(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "Make this a recurring event"
 msgstr "å°?æ¤é ?è¨ç?ºå¾ªç?°äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "æ??å?¥é?²é??å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
 msgstr "å?¨å¤©äº?ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Toggles whether to have All Day Event"
 msgstr "å??æ??æ?¯å?¦è¦?æ??å?¨å¤©äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Show Time as _Busy"
 msgstr "é¡¯ç¤ºæ??é??ç?ºå¿?ç¢?(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Toggles whether to show time as busy"
 msgstr "å??æ??æ?¯å?¦å°?æ??é??é¡¯ç¤ºç?ºå¿?ç¢?"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "_Free/Busy"
 msgstr "ç©ºé??/å¿?ç¢?(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:246
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è©¢æ¤å?°æ??è??ç??ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:291
 msgid "Appoint_ment"
 msgstr "ç´?æ??(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:748
+#: ../calendar/gui/dialogs/event-page.c:751
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ä¸?è?½ç·¨è¼¯äº?ä»¶ï¼?å? ç?ºé?¸å??ç??è¡?äº?æ??æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/event-page.c:752
+#: ../calendar/gui/dialogs/event-page.c:755
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯äº?ä»¶ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??äºº"
 
-#: ../calendar/gui/dialogs/event-page.c:764
-#: ../calendar/gui/dialogs/event-page.c:2769
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "é??å??äº?ä»¶å?·æ??é¬§é?´"
 
-#: ../calendar/gui/dialogs/event-page.c:827
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æ??è°å?¬é??äºº(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "ä»£ç??è??(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "å?°æ??è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1062
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "ç?¡é??å§?æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1065
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "ç?¡çµ?æ??æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
-#: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "é??å§?æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1246
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "çµ?æ??æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "é??å§?æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1276
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "çµ?æ??æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1438
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "é?¸å??ç??å?¬é??äººå·²ç¶?æ²?æ??å¸³è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1444
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??å?¬é??äººã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1469
-#: ../calendar/gui/dialogs/task-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "æ??å°?é??è¦?ä¸?å??å?°æ??è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1912
-#: ../calendar/gui/dialogs/task-page.c:1219
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "ç§»é?¤(_R)"
-
-#: ../calendar/gui/dialogs/event-page.c:1913
-#: ../calendar/gui/dialogs/task-page.c:1220
-msgid "_Add "
-msgstr "æ?°å¢?(_A)"
-
-#: ../calendar/gui/dialogs/event-page.c:2639
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
@@ -5257,156 +4110,147 @@ 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:2683
-#: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1825
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "æ?¨æ£æ??ä»» %s ç??ä»£ç??äºº"
 
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 msgstr[1] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 
-#: ../calendar/gui/dialogs/event-page.c:2973
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ç´?æ??å?? %d å°?æ??"
 msgstr[1] "ç´?æ??å?? %d å°?æ??"
 
-#: ../calendar/gui/dialogs/event-page.c:2979
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ç´?æ??å?? %d å??é??"
 msgstr[1] "ç´?æ??å?? %d å??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:2992
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "è?ªè¨?"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
-"ç´?æ??å?? 15 å??é??\n"
-"ç´?æ??å?? 1 å°?æ??\n"
-"ç´?æ??å?? 1 å¤©"
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2964
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "æ²?æ??"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+msgid "1 day before appointment"
+msgstr "ç´?æ??å?? 1 å¤©"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgid "1 hour before appointment"
+msgstr "ç´?æ??å?? 1 å°?æ??"
+
+#: ../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/event-page.glade.h:6
-#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "è?ªè¨?é¬§é?´:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "äº?ä»¶æ??è¿°"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../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.glade.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
 msgstr "é¬§é?´(_A)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:364
 msgid "_Location:"
 msgstr "ä½?ç½®(_L):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "æ??å?»(_T):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:192
-#: ../mail/mail-dialogs.glade.h:21
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
-#: ../smime/gui/smime-ui.glade.h:49
-msgid ""
-"a\n"
-"b"
-msgstr ""
-"a\n"
-"b"
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#, fuzzy
+msgid "for"
+msgstr "æ??å°?(_F):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid ""
-"for\n"
-"until"
-msgstr ""
-"æ?¼\n"
-"ç?´å?°"
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#, fuzzy
+msgid "until"
+msgstr "å?®ä½?(_U):"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111
-#: ../calendar/gui/print.c:2469
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2529
 msgid "Memo"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-page.c:347
+#: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºé?¸å??ç??å??å¿?é??æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/memo-page.c:351
+#: ../calendar/gui/dialogs/memo-page.c:354
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??äºº"
 
-#: ../calendar/gui/dialogs/memo-page.c:871
+#: ../calendar/gui/dialogs/memo-page.c:875
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1031
-#: ../mail/em-format-html.c:1566
-#: ../mail/em-format-html.c:1624
-#: ../mail/em-format-html.c:1649
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:925
-#: ../mail/em-mailer-prefs.c:78
-#: ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:224
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
+#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "æ?¶ä»¶è??"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "é??å§?æ?¥(_R):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "æ?¶ä»¶è??(_O):"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:380
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "ç¾¤çµ?(_G):"
 
@@ -5446,21 +4290,21 @@ msgstr "æ¤ä¾?é ?å??ä»¥å¾?ç??ä¾?é ?"
 msgid "All Instances"
 msgstr "æ??æ??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution ç?¡æ³?ç·¨è¼¯é??å??é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:889
 msgid "Recurrence date is invalid"
 msgstr "é?±æ??æ?§æ?¥æ??ç?¡æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 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:961
+#: ../calendar/gui/dialogs/recurrence-page.c:958
 msgid "on"
 msgstr "ç??"
 
@@ -5468,7 +4312,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:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "first"
 msgstr "ä¸?"
 
@@ -5477,7 +4321,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1021
 msgid "second"
 msgstr "äº?"
 
@@ -5485,7 +4329,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:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "third"
 msgstr "ä¸?"
 
@@ -5493,7 +4337,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:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "fourth"
 msgstr "å??"
 
@@ -5501,7 +4345,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:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "fifth"
 msgstr "ç¬¬äº?"
 
@@ -5509,13 +4353,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:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 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:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1065
 msgid "Other Date"
 msgstr "å?¶å®?æ?¥æ??"
 
@@ -5523,7 +4367,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:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "1st to 10th"
 msgstr "1æ?¥è?³10æ?¥"
 
@@ -5531,7 +4375,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:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "11th to 20th"
 msgstr "11æ?¥è?³20æ?¥"
 
@@ -5539,96 +4383,79 @@ 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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 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:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "day"
 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:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1237
 msgid "on the"
 msgstr "å?¨ç¬¬"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1410
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "æ¬¡"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2105
+#: ../calendar/gui/dialogs/recurrence-page.c:2117
 msgid "Add exception"
 msgstr "å? å?¥ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2146
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Could not get a selection to modify."
 msgstr "ç?¡æ³?å??å¾?è¦?ç·¨è¼¯ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2152
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Modify exception"
 msgstr "ç·¨è¼¯ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2196
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
 msgid "Could not get a selection to delete."
 msgstr "ç?¡æ³?å??å¾?è¦?å?ªé?¤ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2320
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ??é??"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>ä¾?å¤?</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
-msgid "<b>Preview</b>"
-msgstr "<b>é ?è¦½</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>é?±æ??</b>"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 msgid "Every"
 msgstr "æ¯?"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "ä¾?å¤?"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+msgid "Preview"
+msgstr "é ?è¦½"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 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.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
-"å¤©\n"
-"é?±\n"
-"æ??\n"
-"å¹´"
-
-#. 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.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
-msgstr ""
-"æ?¼\n"
-"ç?´å?°\n"
-"æ°¸é? "
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+msgid "forever"
+msgstr "æ°¸é? "
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgid "month(s)"
+msgstr "å??æ??"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgid "week(s)"
+msgstr "é?±"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+msgid "year(s)"
+msgstr "å¹´"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
@@ -5638,86 +4465,132 @@ msgstr "å°?æ??ç??é¬§é?´è??é??å??äº?ä»¶ä¸?èµ·é??å?º"
 msgid "Notify new attendees _only"
 msgstr "å?ªé??ç?¥æ?°ç??å?°æ??è??(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:376
-#: ../calendar/gui/dialogs/task-details-page.c:396
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??é?¯èª¤ "
 
-#: ../calendar/gui/dialogs/task-details-page.c:481
+#: ../calendar/gui/dialogs/task-details-page.c:485
 msgid "Web Page"
 msgstr "ç¶²é ?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">é??é ?</span>"
+#. 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:221
+#: ../calendar/gui/e-task-table.c:236 ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/print.c:2605 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:358
+msgid "Completed"
+msgstr "å·²å®?æ??"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">ç??æ??</span>"
+#. 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:520 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+msgid "High"
+msgstr "é«?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
-"é«?\n"
-"ä¸\n"
-"ä½?\n"
-"æ?ªå®?ç¾©"
+#. 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:219
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:2602
+msgid "In Progress"
+msgstr "é?²è¡?ä¸"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
-"å°?æ?ªé??å§?\n"
-"é?²è¡?ä¸\n"
-"å·²å®?æ??\n"
-"å·²å??æ¶?"
+#. 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:522 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+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:1280 ../calendar/gui/e-task-table.c:521
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../widgets/misc/e-send-options.ui.h:13
+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:217
+#: ../calendar/gui/e-task-table.c:232 ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:2599 ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "æ?ªé??å§?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "å®?æ??ç?¾å??æ¯?(_E):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "ç??æ??(_U):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. 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-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "ç??æ??"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:523 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Undefined"
+msgstr "æ?ªæ??å®?"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "å®?æ??æ?¥æ??(_D):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Priority:"
 msgstr "å?ªå??é ?åº?(_P):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "ç¶²é ?(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "ç??æ??è©³ç´°è³?æ??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "æ??é??è£¡æ?¹è®?/æª¢è¦?è©²å·¥ä½?ç??ç??æ??è©³ç´°è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:371
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:198
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "_Task"
 msgstr "å·¥ä½?(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:337
 msgid "Task Details"
 msgstr "å·¥ä½?è©³ç´°è³?æ??"
 
@@ -5730,32 +4603,32 @@ 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.glade.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "æ??è°å?¬é??äºº(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:803
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥é?¯èª¤"
 
-#: ../calendar/gui/dialogs/task-page.c:1782
+#: ../calendar/gui/dialogs/task-page.c:1700
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "ç?¡æ³?å?¨ '%s' é??å??å·¥ä½?ã??"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
 msgid "Atte_ndees..."
 msgstr "å?°æ??è??(_N)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "å??é¡?(_I)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "å?°æ??æ?¥(_U):"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "æ??å??:"
 
@@ -5835,143 +4708,53 @@ msgstr "%s å?¨ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ç?ºæ?ªç?¥ç??è§¸ç?¼é¡?å??"
 
-#: ../calendar/gui/e-attachment-handler-calendar.c:258
-msgid "I_mport"
-msgstr "å?¯å?¥(_M)"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:340
-msgid "Select a Calendar"
-msgstr "é?¸æ??è¡?äº?æ??"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:367
-msgid "Select a Task List"
-msgstr "é?¸æ??å·¥ä½?æ¸?å?®"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:377
-msgid "I_mport to Calendar"
-msgstr "å?¯å?¥è?³è¡?äº?æ??(_M)"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:384
-msgid "I_mport to Tasks"
-msgstr "å?¯å?¥è?³å·¥ä½?(_M)"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:68
-#: ../calendar/gui/e-cal-component-preview.c:67
-#: ../mail/em-folder-view.c:3210
-#, c-format
-msgid "Click to open %s"
-msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:127
-#: ../calendar/gui/e-cal-component-preview.c:170
-#: ../filter/filter-rule.c:859
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:658
 msgid "Untitled"
 msgstr "ç?¡æ¨?é¡?"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:178
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../calendar/gui/e-cal-component-preview.c:220
-msgid "Start Date:"
-msgstr "é??å§?æ?¥æ??ï¼?"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:191
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../mail/mail-config.glade.h:75
-msgid "Description:"
-msgstr "æ??è¿°:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:215
-#: ../calendar/gui/e-cal-component-preview.c:309
-msgid "Web Page:"
-msgstr "ç¶²é ?ï¼?"
+#: ../calendar/gui/e-cal-component-preview.c:198
+msgid "Categories:"
+msgstr "å??é¡?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:202
-#: ../calendar/gui/e-itip-control.c:1154
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "æ??è¦?:"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
+msgid "Start Date:"
+msgstr "é??å§?æ?¥æ??ï¼?"
+
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "æ?ªæ¢æ?¥æ??ï¼?"
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:238
-#: ../calendar/gui/e-itip-control.c:1178
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "ç??æ??:"
 
-#: ../calendar/gui/e-cal-component-preview.c:242
-#: ../calendar/gui/e-cal-model-tasks.c:359
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-cal-model-tasks.c:752
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:659
-#: ../calendar/gui/print.c:2542
-msgid "In Progress"
-msgstr "é?²è¡?ä¸"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-cal-model-tasks.c:361
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:660
-#: ../calendar/gui/e-itip-control.c:939
-#: ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/print.c:2545
-#: ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Completed"
-msgstr "å·²å®?æ??"
-
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model-tasks.c:357
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:658
-#: ../calendar/gui/print.c:2539
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "æ?ªé??å§?"
-
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "å?ªå??ç?ç´?:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
-#: ../calendar/gui/e-calendar-table.c:585
-#: ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1064
-msgid "High"
-msgstr "é«?"
-
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-cal-model.c:1076
-#: ../calendar/gui/e-calendar-table.c:586
-#: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/message-list.c:1063
-msgid "Normal"
-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
+msgid "Description:"
+msgstr "æ??è¿°:"
 
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-calendar-table.c:587
-#: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1062
-msgid "Low"
-msgstr "ä½?"
+#: ../calendar/gui/e-cal-component-preview.c:368
+msgid "Web Page:"
+msgstr "ç¶²é ?ï¼?"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Created"
 msgstr "å·²å»ºç«?"
 
@@ -5991,17 +4774,16 @@ msgid "Start Date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-task-table.c:572
 msgid "Free"
 msgstr "ç©ºé??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:638
-#: ../calendar/gui/e-meeting-time-sel.c:391
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:573
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
-#: ../calendar/gui/e-cal-model-tasks.c:625
+#: ../calendar/gui/e-cal-model-tasks.c:681
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6011,232 +4793,73 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027
-#: ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/e-meeting-store.c:742
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:731
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1286
+#: ../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:856
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027
-#: ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1286
+#: ../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
 msgid "No"
 msgstr "å?¦"
 
+#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
+#: ../shell/e-shell.c:836
+msgid "Shell Settings"
+msgstr "Shell è¨å®?å?¼"
+
+#: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
+#: ../shell/e-shell.c:837
+msgid "Application-wide settings"
+msgstr "æ??ç?¨ç¨?å¼?è¨å®?å?¼"
+
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:372
-#: ../calendar/gui/e-itip-control.c:1195
-#: ../calendar/gui/e-itip-control.c:1333
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:978
-#: ../calendar/gui/print.c:995
-#: ../mail/em-utils.c:1339
-#: ../plugins/itip-formatter/itip-formatter.c:449
-#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
+#: ../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:967
+#: ../calendar/gui/print.c:984 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
+#: ../plugins/itip-formatter/itip-formatter.c:461
+#: ../plugins/itip-formatter/itip-formatter.c:2325
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1078
+#: ../calendar/gui/e-cal-model.c:1282
 msgid "Recurring"
 msgstr "å¾ªç?°æ¨¡å¼?"
 
-#: ../calendar/gui/e-cal-model.c:1080
+#: ../calendar/gui/e-cal-model.c:1284
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-calendar-table.c:335
-msgid "* No Summary *"
-msgstr "* æ²?æ??æ??è¦? *"
-
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:371
-#: ../calendar/gui/e-calendar-view.c:2429
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "å?¬é??äºº: %s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2433
+#: ../calendar/gui/e-cal-model.c:2179 ../calendar/gui/gnome-cal.c:2028
 #, c-format
-msgid "Organizer: %s"
-msgstr "æ??è°å?¬é??äºº: %s"
-
-#: ../calendar/gui/e-calendar-table.c:405
-msgid "Start: "
-msgstr "é??å§?:"
-
-#: ../calendar/gui/e-calendar-table.c:417
-msgid "Due: "
-msgstr "å?°æ??:"
-
-#: ../calendar/gui/e-calendar-table.c:588
-#: ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "æ?ªæ??å®?"
-
-#: ../calendar/gui/e-calendar-table.c:607
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:608
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:609
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:610
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:611
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:612
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:613
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:614
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:615
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:616
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:617
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-calendar-table.c:897
-#: ../calendar/gui/e-calendar-view.c:659
-#: ../calendar/gui/e-memo-table.c:449
-msgid "Deleting selected objects"
-msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
-
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:873
-#: ../calendar/gui/e-memo-table.c:654
-msgid "Updating objects"
-msgstr "æ?´æ?°ç?©ä»¶"
-
-#: ../calendar/gui/e-calendar-table.c:1364
-#: ../calendar/gui/e-calendar-view.c:1333
-#: ../calendar/gui/e-memo-table.c:828
-#: ../composer/e-composer-actions.c:219
-msgid "Save as..."
-msgstr "å?¦å?æ?°æª?..."
-
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1789
-msgid "New _Task"
-msgstr "æ?°å¢?å·¥ä½?(_T)"
-
-#: ../calendar/gui/e-calendar-table.c:1592
-#: ../calendar/gui/e-memo-table.c:933
-msgid "Open _Web Page"
-msgstr "é??å??ç¶²é ?(_W)"
-
-#: ../calendar/gui/e-calendar-table.c:1593
-#: ../calendar/gui/e-calendar-view.c:1807
-#: ../calendar/gui/e-memo-table.c:934
-#: ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:494
-msgid "_Save As..."
-msgstr "å?¦å?æ?°æª?(_S)..."
-
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1792
-#: ../calendar/gui/e-memo-table.c:935
-msgid "P_rint..."
-msgstr "å??å?°(_R)..."
-
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1812
-#: ../calendar/gui/e-memo-table.c:939
-#: ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1
-#: ../ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "å?ªä¸?(_U)"
-
-#: ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1795
-#: ../calendar/gui/e-calendar-view.c:1814
-#: ../calendar/gui/e-memo-table.c:941
-#: ../ui/evolution-addressbook.xml.h:57
-#: ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
-msgid "_Paste"
-msgstr "è²¼ä¸?(_P)"
-
-#: ../calendar/gui/e-calendar-table.c:1604
-#: ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "æ??æ´¾å·¥ä½?(_A)"
-
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-memo-table.c:945
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "ä»¥ iCale_ndar è½?å¯?"
-
-#: ../calendar/gui/e-calendar-table.c:1606
-msgid "_Mark as Complete"
-msgstr "æ¨?ç¤ºç?ºå®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1607
-msgid "_Mark Selected Tasks as Complete"
-msgstr "æ¨?ç¤ºé?¸å®?ç??å·¥ä½?ç?ºå·²å®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1608
-msgid "_Mark as Incomplete"
-msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1609
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "æ¨?ç¤ºé?¸å®?ç??å·¥ä½?ç?ºæ?ªå®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1614
-msgid "_Delete Selected Tasks"
-msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?(_D)"
-
-#: ../calendar/gui/e-calendar-table.c:1849
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "è«?æ??é??è£¡å¢?å? æ?°ç??å·¥ä½?"
+msgid "Opening %s"
+msgstr "æ£å?¨é??å?? %s"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% å®?æ??"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "è«?æ??é??è£¡å¢?å? æ?°ç??å·¥ä½?"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "å®?æ??"
@@ -6251,7 +4874,7 @@ msgstr "å?°æ??æ?¥"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Priority"
 msgstr "å?ªå??ç?ç´?"
 
@@ -6259,162 +4882,113 @@ msgstr "å?ªå??ç?ç´?"
 msgid "Start date"
 msgstr "é??å§?æ?¥æ??"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:2337
-#: ../calendar/gui/e-meeting-list-view.c:601
-#: ../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
-msgid "Status"
-msgstr "ç??æ??"
-
-#: ../calendar/gui/e-calendar-view.c:1478
-msgid "Moving items"
-msgstr "ç§»å??é ?ç?®"
-
-#: ../calendar/gui/e-calendar-view.c:1480
-msgid "Copying items"
-msgstr "è¤?è£½é ?ç?®"
-
-#: ../calendar/gui/e-calendar-view.c:1786
-msgid "New _Appointment..."
-msgstr "æ?°å¢?ç´?æ??(_A)..."
-
-#: ../calendar/gui/e-calendar-view.c:1787
-msgid "New All Day _Event"
-msgstr "æ?°å¢?å?¨å¤©äº?ä»¶(_E)"
-
-#: ../calendar/gui/e-calendar-view.c:1788
-msgid "New _Meeting"
-msgstr "æ?°å¢?æ??è°(_M)"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1799
-msgid "_Current View"
-msgstr "ç?®å??æª¢è¦?(_C)"
-
-#: ../calendar/gui/e-calendar-view.c:1801
-msgid "Select T_oday"
-msgstr "é?¸æ??ä»?å¤©(_O)"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-msgid "_Select Date..."
-msgstr "é?¸æ??æ?¥æ??(_S)..."
-
-#: ../calendar/gui/e-calendar-view.c:1808
-msgid "Pri_nt..."
-msgstr "å??å?°(_N)..."
-
-#: ../calendar/gui/e-calendar-view.c:1818
-msgid "Cop_y to Calendar..."
-msgstr "è¤?è£½è?³è¡?äº?æ??(_Y)..."
-
-#: ../calendar/gui/e-calendar-view.c:1819
-msgid "Mo_ve to Calendar..."
-msgstr "ç§»è?³è¡?äº?æ??(_V)..."
-
-#: ../calendar/gui/e-calendar-view.c:1820
-msgid "_Delegate Meeting..."
-msgstr "å§?æ´¾æ??è°(_D)..."
-
-#: ../calendar/gui/e-calendar-view.c:1821
-msgid "_Schedule Meeting..."
-msgstr "æ??è°æ??ç¨?(_S)..."
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../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
+msgid "Type"
+msgstr "é¡?å??"
 
-#: ../calendar/gui/e-calendar-view.c:1822
-msgid "_Forward as iCalendar..."
-msgstr "ä»¥ iCale_ndar è½?å¯?..."
+#: ../calendar/gui/e-calendar-view.c:392
+msgid "Cut selected events to the clipboard"
+msgstr "å?ªä¸?é?¸å??ç??äº?ä»¶è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:1823
-msgid "_Reply"
-msgstr "å??è¦?(_R)"
+#: ../calendar/gui/e-calendar-view.c:398
+msgid "Copy selected events to the clipboard"
+msgstr "è¤?è£½é?¸å??ç??äº?ä»¶è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:1824
-#: ../mail/e-attachment-handler-mail.c:140
-#: ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:499
-#: ../ui/evolution-mail-message.xml.h:78
-msgid "Reply to _All"
-msgstr "å??è¦?æ??æ??äºº(_A)"
+#: ../calendar/gui/e-calendar-view.c:404
+msgid "Paste events from the clipboard"
+msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:1829
-msgid "Make this Occurrence _Movable"
-msgstr "å°?é??å??äº?ä»¶æ¨?ç¤ºæ??å?¯ç§»å??(_M)"
+#: ../calendar/gui/e-calendar-view.c:410
+msgid "Delete selected events"
+msgstr "å?ªé?¤é?¸å??ç??äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:1830
-#: ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "å?ªé?¤é??å??äº?ä»¶(_O)"
+#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:195
+#: ../calendar/gui/e-task-table.c:273
+msgid "Deleting selected objects"
+msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:1831
-msgid "Delete _All Occurrences"
-msgstr "å?ªé?¤å?¨é?¨äº?ä»¶(_A)"
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:854
+#: ../calendar/gui/e-task-table.c:1075
+msgid "Updating objects"
+msgstr "æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:2284
-#: ../calendar/gui/e-itip-control.c:1183
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-itip-control.c:1182
+#: ../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:2313
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:2285
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../plugins/itip-formatter/itip-formatter.c:2227
+#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../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:2319
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:2286
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/e-meeting-time-sel.c:390
+#: ../calendar/gui/e-calendar-view.c:1692
+#: ../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
 msgid "Tentative"
 msgstr "æ?«è¨?"
 
-#: ../calendar/gui/e-calendar-view.c:2287
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:200
-#: ../plugins/itip-formatter/itip-formatter.c:2230
+#: ../calendar/gui/e-calendar-view.c:1693
+#: ../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:2322
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
 
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:1694
 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:539
+#: ../calendar/gui/e-task-table.c:750
+#, 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:544
+#: ../calendar/gui/e-task-table.c:753
+#, c-format
+msgid "Organizer: %s"
+msgstr "æ??è°å?¬é??äºº: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2449
-#: ../calendar/gui/print.c:2501
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2561
 #, c-format
 msgid "Location: %s"
 msgstr "ä½?ç½®ï¼?%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2480
+#: ../calendar/gui/e-calendar-view.c:1886
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ??å?»: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:102
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:105
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:113
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6427,12 +5001,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:747
+#: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "é??é?? %02i å??é??"
 
-#: ../calendar/gui/e-day-view-time-item.c:768
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "é¡¯ç¤ºç¬¬äº?æ??å??"
 
@@ -6442,52 +5016,73 @@ 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:840
-#: ../calendar/gui/e-day-view.c:1576
-#: ../calendar/gui/e-week-view-main-item.c:359
-#: ../calendar/gui/print.c:1666
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1698
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:913
+msgid "%a %d %b"
+msgstr "%-m æ?? %-d æ?¥ (%a)"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:949
+msgid "%d %b"
+msgstr "%-m æ?? %-d æ?¥"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805
-#: ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:825
+#: ../calendar/gui/e-day-view.c:1120 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/print.c:814
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808
-#: ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:827
+#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/print.c:816
 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:2309
+#: ../calendar/gui/e-day-view.c:2614
 #, c-format
 msgid "Week %d"
 msgstr "ç¬¬ %d é?±"
 
-#: ../calendar/gui/e-itip-control.c:758
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "æ?¯ã??(è¤?é??å¾ªç?°)"
 
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "æ¯?å¤©"
 msgstr[1] "æ¯? %d å¤©"
 
-#: ../calendar/gui/e-itip-control.c:788
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "æ¯?é?±"
 msgstr[1] "æ¯? %d é?±"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6495,35 +5090,35 @@ msgstr[0] "æ¯?é?±æ?¼"
 msgstr[1] "æ¯? %d é?±æ?¼"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " å?? "
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s æ?¥æ?¼ "
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s æ?¥æ?¼ "
 
-#: ../calendar/gui/e-itip-control.c:842
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "æ¯?æ??"
 msgstr[1] "æ¯? %d æ??"
 
-#: ../calendar/gui/e-itip-control.c:854
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "æ¯?å¹´"
 msgstr[1] "æ¯? %d å¹´"
 
-#: ../calendar/gui/e-itip-control.c:867
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -6531,453 +5126,445 @@ msgstr[0] "ç¸½å?± %d æ¬¡"
 msgstr[1] "ç¸½å?± %d æ¬¡"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:878
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr "ï¼?çµ?æ??æ?¼ "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:900
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "é??å§?"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:914
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "çµ?æ??"
 
-#: ../calendar/gui/e-itip-control.c:954
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Due"
 msgstr "æ?ªæ¢"
 
-#: ../calendar/gui/e-itip-control.c:995
-#: ../calendar/gui/e-itip-control.c:1052
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "iCalendar è³?è¨?"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1012
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "iCalendar é?¯èª¤"
 
-#: ../calendar/gui/e-itip-control.c:1084
-#: ../calendar/gui/e-itip-control.c:1100
-#: ../calendar/gui/e-itip-control.c:1111
-#: ../calendar/gui/e-itip-control.c:1128
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../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
 msgid "An unknown person"
 msgstr "ä¸?æ??äººå£«"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1135
-msgid "<br> Please review the following information, and then select an action from the menu below."
+#: ../calendar/gui/e-itip-control.c:1132
+msgid ""
+"<br> 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:2300
+msgctxt "cal-itip"
+msgid "None"
+msgstr "æ²?æ??"
+
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2224
+#: ../plugins/itip-formatter/itip-formatter.c:2316
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:1274
-msgid "The meeting has been canceled, however it could not be found in your calendars"
+#: ../calendar/gui/e-itip-control.c:1277
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
 msgstr "æ??è°å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨æ?¨ç??è¡?äº?æ??ä¸æ?¾ä¸?å?°"
 
-#: ../calendar/gui/e-itip-control.c:1276
-msgid "The task has been canceled, however it could not be found in your task lists"
+#: ../calendar/gui/e-itip-control.c:1279
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr "å·¥ä½?å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨æ?¨ç??å·¥ä½?æ¸?å?®ä¸æ?¾ä¸?å?°"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?æ??è°è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "æ??è°è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> é??è«? %s å?ºå¸æ¤æ¬¡æ??è°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> é??è«?æ?¨å?ºå¸æ¤æ¬¡æ??è°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "æ??è°æ??æ¡?"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??æ??è°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "æ??è°æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??æ??è°è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "æ??è°æ?´æ?°è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> å·²ç¶?ç?è¦?äº?æ??è°è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "æ??è°ç?è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> å·²ç¶?æ¶?å??æ??è°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "æ??è°å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1401
-#: ../calendar/gui/e-itip-control.c:1478
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> å?³é??äº?ä¸?å??é?£ä»¥ç??è§£ç??è¨?æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "ä¸?æ£ç¢ºç??æ??è°è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1429
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?å·¥ä½?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "å·¥ä½?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> è¦?æ±? %s é?²è¡?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> è¦?æ±?æ?¨é?²è¡?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "å·¥ä½?è¨?å??"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?é ?æ?¢å?ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "å·¥ä½?æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??å·¥ä½?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "å·¥ä½?æ?´æ?°è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> å·²ç¶?å??è¦?æ??æ´¾ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "å·¥ä½?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> å·²ç¶?å??æ¶?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "å·¥ä½?å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1479
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "ä¸?æ£ç¢ºç??å·¥ä½?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?ç©ºé??/å¿?ç¢?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1504
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> è«?æ±?æ?¨ç??ç©ºé??/å¿?ç¢?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "ç©ºé??/å¿?ç¢?è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1516
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> å·²ç¶?ç?è¦?ç©ºé??/å¿?ç¢?è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "ç©ºé??/å¿?ç¢?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "ä¸?æ£ç¢ºç??ç©ºé??/å¿?ç¢?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1595
+#: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
 msgstr "é?µä»¶ä¼¼ä¹?æ²?æ??è¢«é?©ç?¶å?°çµ?æ??"
 
-#: ../calendar/gui/e-itip-control.c:1654
+#: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
 msgstr "é??å??é?µä»¶å?ªå??å?«ä¸?æ?¯æ?´ç??è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1687
+#: ../calendar/gui/e-itip-control.c:1690
 msgid "The attachment does not contain a valid calendar message"
 msgstr "é??ä»¶ä¸¦æ?ªå??å?«å??æ³?ç??è¡?äº?æ??è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1725
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "é??ä»¶æ²?æ??å?¯æª¢è¦?ç??è¡?äº?æ??é ?ç?®"
 
-#: ../calendar/gui/e-itip-control.c:1967
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "æ?´æ?°å®?æ??\n"
 
-#: ../calendar/gui/e-itip-control.c:2001
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ç?©ä»¶æ?¯ç?¡æ??ç??è??ä¸?ä¸?è?½æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2018
+#: ../calendar/gui/e-itip-control.c:2022
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "é??å??å??è¦?ä¸¦é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?ä»?å? å?¥ç?ºå?°æ??è??ï¼?"
 
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2040
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??ä½¿å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2060
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2067
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1408
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "å?°æ??è??ç??æ??ä¸?è?½æ?´æ?°ï¼?å? ç?ºé ?ç?®å·²ç¶?ä¸?å?å?¨"
 
-#: ../calendar/gui/e-itip-control.c:2098
-#: ../calendar/gui/e-itip-control.c:2155
+#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "é ?ç?®å?³é??ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2104
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr "ç?¡æ³?å?³é??é??å??é ?ç?®ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2281
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "é?¸æ??ä¸?å??å??ä½?:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2310
-#: ../calendar/gui/e-meeting-list-view.c:589
+#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2350
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:2374
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2375
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2376
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "æ??çµ?"
 
-#: ../calendar/gui/e-itip-control.c:2401
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "é??å?ºç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:2425
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "æ?´æ?°å??æ??ç??æ??"
 
-#: ../calendar/gui/e-itip-control.c:2449
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "é??å?ºæ??æ?°è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:2473
-#: ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1088
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--å?°--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "è¡?äº?æ??è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "æ?¥æ??:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "è¼?å?¥è¡?äº?æ??"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "è¼?å?¥è¡?äº?æ??..."
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
 msgstr "æ??è°å?¬é??äºº:"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "ä¼ºæ??å?¨è¨?æ?¯:"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "ä¸»å¸"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "å?ºå¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "å??å¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "è³?æº?"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:84
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:736
-#: ../calendar/gui/print.c:974
+#: ../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:850 ../calendar/gui/print.c:963
 msgid "Individual"
 msgstr "å??å?¥"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/print.c:975
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/print.c:964 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ç¾¤çµ?"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:976
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/print.c:965
 msgid "Resource"
 msgstr "è³?æº?"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90
-#: ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:977
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/print.c:966
 msgid "Room"
 msgstr "æ??è°å®¤"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:991
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:980
 msgid "Chair"
 msgstr "ä¸»å¸"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:739
-#: ../calendar/gui/print.c:992
+#: ../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:853 ../calendar/gui/print.c:981
 msgid "Required Participant"
 msgstr "å?ºå¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:993
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/print.c:982
 msgid "Optional Participant"
 msgstr "å??å¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:994
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/print.c:983
 msgid "Non-Participant"
 msgstr "ç¼ºå¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../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: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:544
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/e-meeting-store.c:181
-#: ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 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:2083
+#: ../calendar/gui/e-meeting-time-sel.c:2284
 msgid "%A, %B %d, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
@@ -6986,7 +5573,7 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 #. 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:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2315
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -6996,67 +5583,67 @@ msgstr "%Y/%m/%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:392
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Out of Office"
 msgstr "ä¸?å?¨è¾¦å?¬å®¤"
 
-#: ../calendar/gui/e-meeting-time-sel.c:393
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "No Information"
 msgstr "æ²?æ??è³?è¨?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:408
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "A_ttendees..."
 msgstr "å?°æ??è??(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:429
+#: ../calendar/gui/e-meeting-time-sel.c:581
 msgid "O_ptions"
 msgstr "é?¸é ?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:598
 msgid "Show _only working hours"
 msgstr "å?ªé¡¯ç¤ºå·¥ä½?æ??é??(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:456
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "é¡¯ç¤ºç¸®å°?(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:623
 msgid "_Update free/busy"
 msgstr "æ?´æ?°ç©ºé??/å¿?ç¢?(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:504
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "è?ªå??é?¸æ??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:536
+#: ../calendar/gui/e-meeting-time-sel.c:688
 msgid "_All people and resources"
 msgstr "æ??æ??äººå?¡å??è³?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:697
 msgid "All _people and one resource"
 msgstr "æ??æ??äººå?¡å??ä¸?å??è³?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:554
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "_Required people"
 msgstr "å¿?è¦?ç??äººå?¡(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "Required people and _one resource"
 msgstr "å¿?è¦?äººå?¡å??ä¸?å??è³?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:760
 msgid "_Start time:"
 msgstr "é??å§?æ??å?»(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:626
+#: ../calendar/gui/e-meeting-time-sel.c:797
 msgid "_End time:"
 msgstr "çµ?æ??æ??å?»(_E):"
 
@@ -7084,171 +5671,383 @@ msgstr "èª?è¨?"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:950
-msgid "_Delete Selected Memos"
-msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??(_D)"
+#: ../calendar/gui/e-memo-table.c:423
+#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../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
+msgid "Memos"
+msgstr "å??å¿?é??"
+
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:714
+msgid "* No Summary *"
+msgstr "* æ²?æ??æ??è¦? *"
+
+#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:794
+msgid "Start: "
+msgstr "é??å§?:"
+
+#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:812
+msgid "Due: "
+msgstr "å?°æ??:"
+
+#: ../calendar/gui/e-memo-table.c:719
+msgid "Cut selected memos to the clipboard"
+msgstr "å?ªä¸?é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
+
+#: ../calendar/gui/e-memo-table.c:725
+msgid "Copy selected memos to the clipboard"
+msgstr "è¤?è£½é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
+
+#: ../calendar/gui/e-memo-table.c:731
+msgid "Paste memos from the clipboard"
+msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
+
+#: ../calendar/gui/e-memo-table.c:737
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+msgid "Delete selected memos"
+msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
+
+#: ../calendar/gui/e-memo-table.c:743
+msgid "Select all visible memos"
+msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:1099
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "è«?æ??é??è£¡å¢?å? æ?°ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memos.c:754
-#: ../calendar/gui/e-tasks.c:902
-#, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"ç?¼ç??æ?¼ %s ç??é?¯èª¤ï¼?\n"
-" %s"
+#: ../calendar/gui/e-task-table.c:542
+msgid "0%"
+msgstr "0%"
 
-#: ../calendar/gui/e-memos.c:806
-msgid "Loading memos"
-msgstr "æ£å?¨è¼?å?¥å??å¿?é??"
+#: ../calendar/gui/e-task-table.c:543
+msgid "10%"
+msgstr "10%"
 
-#: ../calendar/gui/e-memos.c:897
-#, c-format
-msgid "Opening memos at %s"
-msgstr "é??å??å?¨ %s ç??å??å¿?é??"
+#: ../calendar/gui/e-task-table.c:544
+msgid "20%"
+msgstr "20%"
 
-#: ../calendar/gui/e-memos.c:1066
-#: ../calendar/gui/e-tasks.c:1318
-msgid "Deleting selected objects..."
-msgstr "æ£å?¨å?ªé?¤é?¸å®?ç??ç?©ä»¶..."
+#: ../calendar/gui/e-task-table.c:545
+msgid "30%"
+msgstr "30%"
 
-#: ../calendar/gui/e-tasks.c:955
-msgid "Loading tasks"
-msgstr "æ£å?¨è¼?å?¥å·¥ä½?"
+#: ../calendar/gui/e-task-table.c:546
+msgid "40%"
+msgstr "40%"
 
-#: ../calendar/gui/e-tasks.c:1052
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "é??å??å?¨ %s ç??å·¥ä½?"
+#: ../calendar/gui/e-task-table.c:547
+msgid "50%"
+msgstr "50%"
+
+#: ../calendar/gui/e-task-table.c:548
+msgid "60%"
+msgstr "60%"
 
-#: ../calendar/gui/e-tasks.c:1295
-msgid "Completing tasks..."
-msgstr "æ£å?¨å®?æ??å·¥ä½?..."
+#: ../calendar/gui/e-task-table.c:549
+msgid "70%"
+msgstr "70%"
 
-#: ../calendar/gui/e-tasks.c:1345
-msgid "Expunging"
-msgstr "é?¤å?»ä¸"
+#: ../calendar/gui/e-task-table.c:550
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-task-table.c:551
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-task-table.c:552
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2006
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../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/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "å·¥ä½?"
 
-#: ../calendar/gui/e-timezone-entry.c:124
+#: ../calendar/gui/e-task-table.c:940
+msgid "Cut selected tasks to the clipboard"
+msgstr "å?ªä¸?é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
+
+#: ../calendar/gui/e-task-table.c:946
+msgid "Copy selected tasks to the clipboard"
+msgstr "è¤?è£½é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
+
+#: ../calendar/gui/e-task-table.c:952
+msgid "Paste tasks from the clipboard"
+msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å·¥ä½?"
+
+#: ../calendar/gui/e-task-table.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:701
+msgid "Delete selected tasks"
+msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
+
+#: ../calendar/gui/e-task-table.c:964
+msgid "Select all visible tasks"
+msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å·¥ä½?"
+
+#: ../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:376
-#: ../calendar/gui/print.c:1647
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1679
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2673
-msgid "_Custom View"
-msgstr "è?ªè¨?æª¢è¦?(_C)"
+#: ../calendar/gui/ea-cal-view-event.c:263
+msgid "It has alarms."
+msgstr "å®?å?·æ??é¬§é?´ã??"
 
-#: ../calendar/gui/gnome-cal.c:2674
-msgid "_Save Custom View"
-msgstr "å?²å?è?ªè¨?æª¢è¦?(_S)"
+#: ../calendar/gui/ea-cal-view-event.c:266
+msgid "It has recurrences."
+msgstr "å®?æ?¯é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/gnome-cal.c:2679
-msgid "_Define Views..."
-msgstr "å®?ç¾©æª¢è¦?(_D)..."
+#: ../calendar/gui/ea-cal-view-event.c:269
+msgid "It is a meeting."
+msgstr "é??æ?¯ä¸?é ?æ??è°ã??"
 
-#: ../calendar/gui/gnome-cal.c:2916
+#: ../calendar/gui/ea-cal-view-event.c:275
 #, c-format
-msgid "Loading appointments at %s"
-msgstr "è¼?å?¥ %s ç??ç´?æ??"
+msgid "Calendar Event: Summary is %s."
+msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ??è¦?ç?º %sã??"
+
+#: ../calendar/gui/ea-cal-view-event.c:277
+msgid "Calendar Event: It has no summary."
+msgstr "è¡?äº?æ??äº?ä»¶ï¼?æ²?æ??æ??è¦?ã??"
+
+#: ../calendar/gui/ea-cal-view-event.c:299
+msgid "calendar view event"
+msgstr "è¡?äº?æ??æª¢è¦?äº?ä»¶"
+
+#: ../calendar/gui/ea-cal-view-event.c:527
+msgid "Grab Focus"
+msgstr "å¾?å?°ç?¦é»?"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Appointment"
+msgstr "æ?°å¢?ç´?æ??"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "New All Day Event"
+msgstr "æ?°å¢?å?¨å¤©äº?ä»¶"
+
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "New Meeting"
+msgstr "æ?°å¢?æ??è°"
+
+#: ../calendar/gui/ea-cal-view.c:303
+msgid "Go to Today"
+msgstr "ç§»è?³ä»?æ?¥"
+
+#: ../calendar/gui/ea-cal-view.c:304
+msgid "Go to Date"
+msgstr "ç§»è?³æ?¥æ??"
+
+#: ../calendar/gui/ea-day-view-main-item.c:305
+#: ../calendar/gui/ea-week-view-main-item.c:302
+msgid "a table to view and select the current time range"
+msgstr "ç?¨ä¾?æª¢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??è¡¨æ ¼"
 
-#: ../calendar/gui/gnome-cal.c:2931
+#. 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:147 ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "è¼?å?¥ %s ç??å·¥ä½?"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "å®?æ?? %d å??äº?ä»¶ã??"
+msgstr[1] "å®?æ?? %d å??äº?ä»¶ã??"
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "å®?æ²?æ??äº?ä»¶ã??"
 
-#: ../calendar/gui/gnome-cal.c:2940
+#. 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:158
 #, c-format
-msgid "Loading memos at %s"
-msgstr "æ£å?¨è¼?å?¥ %s ç??å??å¿?é??"
+msgid "Work Week View: %s. %s"
+msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/gnome-cal.c:3052
+#. 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:164
 #, c-format
-msgid "Opening %s"
-msgstr "æ£å?¨é??å?? %s"
+msgid "Day View: %s. %s"
+msgstr "æ?¥æª¢è¦?ï¼?%sã??%s"
+
+#: ../calendar/gui/ea-day-view.c:195
+msgid "calendar view for a work week"
+msgstr "å·¥ä½?é?±ç??è¡?äº?æ??æª¢è¦?"
+
+#: ../calendar/gui/ea-day-view.c:197
+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
+msgid "Gnome Calendar"
+msgstr "Gnome è¡?äº?æ??"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:909
+msgid "%A %d %b %Y"
+msgstr "%Y/%m/%d (%a)"
 
-#: ../calendar/gui/gnome-cal.c:4018
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
+msgid "%a %d %b %Y"
+msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%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:240
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
+msgid "%d %b %Y"
+msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
+
+#: ../calendar/gui/ea-jump-button.c:147
+msgid "Jump button"
+msgstr "è·³èº?æ??é??"
+
+#: ../calendar/gui/ea-jump-button.c:156
+msgid "Click here, you can find more events."
+msgstr "æ??é??è£¡ï¼?æ?¨å?¯ä»¥æ?¾å?°æ?´å¤?äº?ä»¶ã??"
+
+#: ../calendar/gui/ea-week-view.c:153
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "æ??æª¢è¦?ï¼?%sã??%s"
+
+#: ../calendar/gui/ea-week-view.c:157
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "é?±æª¢è¦?ï¼?%sã??%s"
+
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??æª¢è¦?"
+
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??æª¢è¦?"
+
+#: ../calendar/gui/gnome-cal.c:1942
+#, c-format
+msgid "Loading appointments at %s"
+msgstr "è¼?å?¥ %s ç??ç´?æ??"
+
+#: ../calendar/gui/gnome-cal.c:2557
 msgid "Purging"
 msgstr "æ¸?é?¤"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
-msgstr ""
-"ä¸?æ??\n"
-"äº?æ??\n"
-"ä¸?æ??\n"
-"å??æ??\n"
-"äº?æ??\n"
-"å?æ??\n"
-"ä¸?æ??\n"
-"å?«æ??\n"
-"ä¹?æ??\n"
-"å??æ??\n"
-"å??ä¸?æ??\n"
-"å??äº?æ??"
-
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:1
+msgid "April"
+msgstr "å??æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:2
+msgid "August"
+msgstr "å?«æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:3
+msgid "December"
+msgstr "å??äº?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:4
+msgid "February"
+msgstr "äº?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:5
+msgid "January"
+msgstr "ä¸?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:6
+msgid "July"
+msgstr "ä¸?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:7
+msgid "June"
+msgstr "å?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:8
+msgid "March"
+msgstr "ä¸?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:9
+msgid "May"
+msgstr "äº?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:10
+msgid "November"
+msgstr "å??ä¸?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:11
+msgid "October"
+msgstr "å??æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "é?¸æ??æ?¥æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:13
+msgid "September"
+msgstr "ä¹?æ??"
+
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "é?¸æ??ä»?å¤©(_S)"
 
-#: ../calendar/gui/itip-utils.c:410
-#: ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:553
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??äººã??"
 
-#: ../calendar/gui/itip-utils.c:453
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?å??å?°æ??è??"
 
-#: ../calendar/gui/itip-utils.c:635
-#: ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:784
 msgid "Event information"
 msgstr "äº?ä»¶è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:637
-#: ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:787
 msgid "Task information"
 msgstr "å·¥ä½?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:639
-#: ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:790
 msgid "Memo information"
 msgstr "å??å¿?é??è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:641
-#: ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:643 ../calendar/gui/itip-utils.c:808
 msgid "Free/Busy information"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:646
 msgid "Calendar information"
 msgstr "è¡?äº?æ??è³?è¨?"
 
@@ -7256,7 +6055,7 @@ msgstr "è¡?äº?æ??è³?è¨?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:680
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "å·²æ?¥å??"
@@ -7265,7 +6064,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:684
+#: ../calendar/gui/itip-utils.c:687
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
@@ -7277,8 +6076,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:691
-#: ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:742
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "å·²æ??çµ?"
@@ -7287,7 +6085,7 @@ msgstr "å·²æ??çµ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:701
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
@@ -7295,7 +6093,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:711
+#: ../calendar/gui/itip-utils.c:714
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "å·²æ?´æ?°"
@@ -7303,7 +6101,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:718
+#: ../calendar/gui/itip-utils.c:721
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -7311,7 +6109,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:725
+#: ../calendar/gui/itip-utils.c:728
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "é??æ?°æ?´ç??"
@@ -7319,429 +6117,231 @@ 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:732
+#: ../calendar/gui/itip-utils.c:735
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??ç¥¨è¡¨å?³"
 
-#: ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:805
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨? (%s å?° %s)"
 
-#: ../calendar/gui/itip-utils.c:810
+#: ../calendar/gui/itip-utils.c:813
 msgid "iCalendar information"
 msgstr "iCalendar è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:981
-msgid "You must be an attendee of the event."
-msgstr "æ?¨å¿?é ?æ?¯æ¤äº?ä»¶ç??å?°æ??è??ã??"
-
-#: ../calendar/gui/memos-component.c:477
-msgid "_New Memo List"
-msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
-
-#: ../calendar/gui/memos-component.c:560
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d é ?å??å¿?é??"
-msgstr[1] "%d é ?å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:562
-#: ../calendar/gui/tasks-component.c:555
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] "ï¼?å·²é?¸æ?? %d å??"
-msgstr[1] "ï¼?å·²é?¸æ?? %d å??"
-
-#: ../calendar/gui/memos-component.c:609
-msgid "Failed upgrading memos."
-msgstr "å??ç´?å??å¿?é??å¤±æ??ã??"
-
-#: ../calendar/gui/memos-component.c:739
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "ç?¡æ³?é??å??å??å¿?é??æ¸?å?®ã??%sã??ä¾?å»ºç«?äº?ä»¶å??æ??è°"
-
-#: ../calendar/gui/memos-component.c:752
-msgid "There is no calendar available for creating memos"
-msgstr "æ²?æ??å?¯ç?¨ç??è¡?äº?æ??ä¾?å»ºç«?å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:862
-msgid "Memo Source Selector"
-msgstr "å??å¿?é??ä¾?æº?é?¸æ??å?¨"
-
-#: ../calendar/gui/memos-component.c:1041
-msgid "New memo"
-msgstr "æ?°å¢?å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:1042
-msgctxt "New"
-msgid "Mem_o"
-msgstr "å??å¿?é??(_O)"
-
-#: ../calendar/gui/memos-component.c:1043
-msgid "Create a new memo"
-msgstr "å»ºç«?æ?°ç??å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:1049
-msgid "New shared memo"
-msgstr "æ?°å¢?å?±ç?¨å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:1050
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "å?±ç?¨å??å¿?é??(_S)"
-
-#: ../calendar/gui/memos-component.c:1051
-msgid "Create a shared new memo"
-msgstr "å»ºç«?æ?°ç??å?±ç?¨å??å¿?é??"
-
-#: ../calendar/gui/memos-component.c:1057
-msgid "New memo list"
-msgstr "æ?°å??å¿?é??æ¸?å?®"
-
-#: ../calendar/gui/memos-component.c:1058
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "å??å¿?é??æ¸?å?®(_S)"
-
-#: ../calendar/gui/memos-component.c:1059
-msgid "Create a new memo list"
-msgstr "å»ºç«?æ?°å??å¿?é??æ¸?å?®"
-
-# zh_HK: msgstr "æ??å?°å??å¿?é??"
-#: ../calendar/gui/memos-control.c:386
-#: ../calendar/gui/memos-control.c:402
-msgid "Print Memos"
-msgstr "æ??å?°å??å¿?é??"
-
-#: ../calendar/gui/migration.c:157
-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 ""
-"Evolution å·¥ä½?è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.xå¾?å°±è®?æ?´äº?ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../calendar/gui/migration.c:161
-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..."
+#: ../calendar/gui/itip-utils.c:833
+msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"Evolution è¡?äº?æ??è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:774
-#: ../calendar/gui/migration.c:942
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "ç?¡æ³?å¾? evolution/config.xmldb ç§»è½?è??è¨å®?"
 
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:803
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "ç?¡æ³?ç§»è½?ç§»è¡?äº?æ?? `%s'"
+#: ../calendar/gui/itip-utils.c:835
+#, fuzzy
+msgid "Unable to book a resource, error: "
+msgstr "é?¯èª¤ï¼?ç?¡æ³?è??ç??å»¶ä¼¸"
 
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:971
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "ç?¡æ³?ç§»è½?å·¥ä½? `%s'"
+#: ../calendar/gui/itip-utils.c:988
+msgid "You must be an attendee of the event."
+msgstr "æ?¨å¿?é ?æ?¯æ¤äº?ä»¶ç??å?°æ??è??ã??"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "Mo"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "Tu"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "We"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "Fr"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "Sa"
 msgstr "å?"
 
-#: ../calendar/gui/print.c:2465
+#: ../calendar/gui/print.c:2525
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2527
 msgid "Task"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/print.c:2492
+#: ../calendar/gui/print.c:2552
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:2575
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2629
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2644
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2655
 #, c-format
 msgid "URL: %s"
 msgstr "ç¶²å??: %s"
 
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/print.c:2668
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2619
+#: ../calendar/gui/print.c:2679
 msgid "Contacts: "
 msgstr "é?£çµ¡äºº: "
 
-#: ../calendar/gui/tasks-component.c:470
-msgid "_New Task List"
-msgstr "æ?°å¢?å·¥ä½?æ¸?å?®(_N)"
-
-#: ../calendar/gui/tasks-component.c:553
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d é ?å·¥ä½?"
-msgstr[1] "%d é ?å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:602
-msgid "Failed upgrading tasks."
-msgstr "å??ç´?å·¥ä½?å¤±æ??ã??"
-
-#: ../calendar/gui/tasks-component.c:735
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "ç?¡æ³?é??å??å·¥ä½?æ¸?å?® '%s' ä¾?å»ºç«?äº?ä»¶å??æ??è°"
-
-#: ../calendar/gui/tasks-component.c:748
-msgid "There is no calendar available for creating tasks"
-msgstr "æ²?æ??å?¯ç?¨ç??è¡?äº?æ??ä¾?å»ºç«?å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:859
-msgid "Task Source Selector"
-msgstr "å·¥ä½?ä¾?æº?é?¸æ??å?¨"
-
-#: ../calendar/gui/tasks-component.c:1113
-msgid "New task"
-msgstr "æ?°å¢?å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:1114
-msgctxt "New"
-msgid "_Task"
-msgstr "å·¥ä½?(_T)"
-
-#: ../calendar/gui/tasks-component.c:1115
-msgid "Create a new task"
-msgstr "å»ºç«?ä¸?å??æ?°ç??å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:1121
-msgid "New assigned task"
-msgstr "æ?°æ??å®?ç??å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:1122
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
-
-#: ../calendar/gui/tasks-component.c:1123
-msgid "Create a new assigned task"
-msgstr "å»ºç«?æ?°æ??å®?ç??å·¥ä½?"
-
-#: ../calendar/gui/tasks-component.c:1129
-msgid "New task list"
-msgstr "æ?°å·¥ä½?æ¸?å?®"
-
-#: ../calendar/gui/tasks-component.c:1130
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "å·¥ä½?æ¸?å?®(_K)"
-
-#: ../calendar/gui/tasks-component.c:1131
-msgid "Create a new task list"
-msgstr "å»ºç«?æ?°å·¥ä½?æ¸?å?®"
-
-#: ../calendar/gui/tasks-control.c:484
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"é??å??å??ä½?æ??æ°¸ä¹?å?°æ¸?é?¤æ??æ??æ¨?ç¤ºç?ºå·²å®?æ??ç??å·¥ä½?ã??å¦?æ??æ?¨è¦?ç¹¼çº?ï¼?æ?¨å°?ä¸?è?½å¾©å??é??äº?å·¥ä½?ã??\n"
-"\n"
-"ç¢ºå®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
-
-#: ../calendar/gui/tasks-control.c:487
-#: ../mail/em-folder-view.c:1126
-msgid "Do not ask me again."
-msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯ã??"
-
-#: ../calendar/gui/tasks-control.c:524
-#: ../calendar/gui/tasks-control.c:540
-msgid "Print Tasks"
-msgstr "å??å?°å·¥ä½?"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -7755,13 +6355,11 @@ msgstr "å·²å??æ¶?"
 msgid "In progress"
 msgstr "æ£å?¨é?²è¡?"
 
-#: ../calendar/gui/tasktypes.xml.h:28
-#: ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "å¤§æ?¼"
 
-#: ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "å°?æ?¼"
 
@@ -7770,8 +6368,8 @@ msgid "Appointments and Meetings"
 msgstr "ç´?æ??å??æ??è°"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1820
 msgid "Opening calendar"
 msgstr "é??å??è¡?äº?æ??"
 
@@ -7795,11 +6393,11 @@ msgstr "vCalendar æª?æ¡? (.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar è¼¸å?¥å?¨"
 
-#: ../calendar/importers/icalendar-importer.c:746
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "è¡?äº?æ??äº?ä»¶"
 
-#: ../calendar/importers/icalendar-importer.c:783
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution è¡?äº?æ??æ?ºæ?§è¼¸å?¥å?¨"
 
@@ -8352,7 +6950,7 @@ msgid "America/Nassau"
 msgstr "ç¾?æ´²/æ?¿ç´¢"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "ç¾?æ´²/ç´?ç´?"
 
@@ -9352,291 +7950,281 @@ msgstr "å¤ªå¹³æ´?/ç?¦å?©æ?¯"
 msgid "Pacific/Yap"
 msgstr "å¤ªå¹³æ´?/é??æµ¦å³¶"
 
-#: ../composer/e-composer-autosave.c:445
-msgid "Unable to retrieve message from editor"
-msgstr "ç?¡æ³?å¾?ç·¨è¼¯å?¨å??å¾?é?µä»¶"
-
-#: ../composer/e-composer-actions.c:84
+#: ../composer/e-composer-actions.c:79
 msgid "Untitled Message"
 msgstr "æ?ªå?½å??ç??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:202
+msgid "Save as..."
+msgstr "å?¦å?æ?°æª?..."
+
+#: ../composer/e-composer-actions.c:281
 #: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:322
-#: ../mail/mail-signature-editor.c:195
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:286
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "é??é??(_C)"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:288
 msgid "Close the current file"
 msgstr "é??é??ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:329
-#: ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58
-#: ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:119
-#: ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:293
 msgid "_Print..."
 msgstr "å??å?°(_P)..."
 
-#: ../composer/e-composer-actions.c:336
-#: ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-mail-message.xml.h:72
-#: ../ui/evolution-memos.xml.h:12
-#: ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:300
 msgid "Print Pre_view"
 msgstr "é ?è¦½å??å?°(_V)"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:309
 msgid "Save the current file"
 msgstr "å?²å?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:314
 msgid "Save _As..."
 msgstr "å?¦å?æ?°æª?(_A)..."
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:316
 msgid "Save the current file with a different name"
 msgstr "ä»¥å?¦ä¸?å??å??ç¨±å?²å?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:321
 msgid "Save as _Draft"
 msgstr "å?²å?ç?ºè??ç¨¿(_D)"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:323
 msgid "Save as draft"
 msgstr "å?²å?ç?ºè??ç¨¿"
 
-#: ../composer/e-composer-actions.c:364
-#: ../composer/e-composer-private.c:191
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:264
 msgid "S_end"
 msgstr "å?³é??(_E)"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:330
 msgid "Send this message"
 msgstr "å?³é??é??å??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:373
-msgid "Insert Send options"
-msgstr "æ??å?¥å?³é??é?¸é ?"
-
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:335
 msgid "New _Message"
 msgstr "æ?°å¯«æ?°é?µä»¶(_M)"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:337
 msgid "Open New Message window"
 msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:344
 msgid "Character _Encoding"
 msgstr "å?å??ç·¨ç¢¼(_E)"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:351
 msgid "_Security"
 msgstr "å®?å?¨æ?§(_S)"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PG_P å? å¯?"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "ä½¿ç?¨ PGP å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "P_GP å? ç°½"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨æ?¨ç?? PGP é??é?°ç?ºé?µä»¶å? ä¸?æ?¸ä½?ç°½ç« "
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:377
 msgid "_Prioritize Message"
 msgstr "é?µä»¶å?ªå??æ¬?(_P)"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:379
 msgid "Set the message priority to high"
 msgstr "å°?é?µä»¶å?ªå??æ¬?è¨ç?ºã??é«?ã??"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:385
 msgid "Re_quest Read Receipt"
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?(_Q)"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:387
 msgid "Get delivery notification when your message is read"
 msgstr "å?¨æ?¨ç??é?µä»¶è¢«é?±è®?æ??å??å¾?é??ä¿¡é??ç?¥"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:393
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME å? å¯?"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ä½¿ç?¨æ?¨ç?? S/MIME å? å¯?æ??è?å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME å? ç°½"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME ç°½å??æ??è?ç?ºé?µä»¶å? ä¸?æ?¸ä½?ç°½ç« "
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
 msgstr "å¯?ä»¶å?¯æ?¬æ¬?ä½?(_B)"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
 msgstr "å??æ??å¯?ä»¶å?¯æ?¬æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:460
+#: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
 msgstr "å?¯æ?¬æ¬?ä½?(_C)"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
 msgstr "å??æ??å?¯æ?¬æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:468
+#: ../composer/e-composer-actions.c:425
 msgid "_From Field"
 msgstr "å¯?ä»¶è??æ¬?ä½?(_F)"
 
-#: ../composer/e-composer-actions.c:470
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
 msgstr "å??æ??å¯?ä»¶è??é?¸æ??å?¨ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:476
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "å??è¦?æ¬?ä½?(_R)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "å??æ??å??è¦?æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:478
 msgid "Save Draft"
 msgstr "å?²å?è??ç¨¿"
 
-#: ../composer/e-composer-header.c:120
+#: ../composer/e-composer-header.c:129
 msgid "Show"
 msgstr "é¡¯ç¤º"
 
-#: ../composer/e-composer-header.c:123
+#: ../composer/e-composer-header.c:137
 msgid "Hide"
 msgstr "é?±è??"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
 msgstr "è¼¸å?¥é?µä»¶ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:44
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "è¼¸å?¥é?µä»¶å?¯æ?¬ç??æ?¶ä»¶è??"
 
-#: ../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"
-msgstr "è¼¸å?¥é?µä»¶å¯?ä»¶å?¯æ?¬ç??æ?¶ä»¶è??ï¼?ä»?å??æ??æ?¶å?°é??å°?é?µä»¶ä½?ä¸?æ??å?ºç?¾å?¨é?µä»¶ç??æ?¶ä»¶è??æ¸?å?®"
+#: ../composer/e-composer-header-table.c:47
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message"
+msgstr ""
+"è¼¸å?¥é?µä»¶å¯?ä»¶å?¯æ?¬ç??æ?¶ä»¶è??ï¼?ä»?å??æ??æ?¶å?°é??å°?é?µä»¶ä½?ä¸?æ??å?ºç?¾å?¨é?µä»¶ç??æ?¶ä»¶è??æ¸?å?®"
 
-#: ../composer/e-composer-header-table.c:945
+#: ../composer/e-composer-header-table.c:959
 msgid "Fr_om:"
 msgstr "å¯?ä»¶è??(_O):"
 
-#: ../composer/e-composer-header-table.c:945
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:923
-#: ../mail/em-mailer-prefs.c:76
-#: ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:296
+#: ../composer/e-composer-header-table.c:959
+#: ../em-format/em-format-quote.c:224 ../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:954
+#: ../composer/e-composer-header-table.c:968
 msgid "_Reply-To:"
 msgstr "å??è¦?å?°å??(_R):"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:973
 msgid "_To:"
 msgstr "æ?¶ä»¶è??(_T):"
 
-#: ../composer/e-composer-header-table.c:965
+#: ../composer/e-composer-header-table.c:979
 msgid "_Cc:"
 msgstr "å?¯æ?¬(_C):"
 
-#: ../composer/e-composer-header-table.c:965
-#: ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "å?¯æ?¬(CC)"
 
-#: ../composer/e-composer-header-table.c:971
+#: ../composer/e-composer-header-table.c:985
 msgid "_Bcc:"
 msgstr "å¯?ä»¶å?¯æ?¬(_B):"
 
-#: ../composer/e-composer-header-table.c:971
-#: ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "å¯?ä»¶å?¯æ?¬(BCC)"
 
-#: ../composer/e-composer-header-table.c:976
+#: ../composer/e-composer-header-table.c:990
 msgid "_Post To:"
 msgstr "å¼µè²¼å?°(_P):"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:994
 msgid "S_ubject:"
 msgstr "ä¸»æ?¨(_U):"
 
-#: ../composer/e-composer-header-table.c:989
+#: ../composer/e-composer-header-table.c:1003
 msgid "Si_gnature:"
 msgstr "ç°½å??æª?(_G):"
 
-#: ../composer/e-composer-name-header.c:116
+#: ../composer/e-composer-name-header.c:134
 msgid "Click here for the address book"
 msgstr "æ??é??è£¡æ?°å¢?ç?®é??æ??å??"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "å¼µè²¼ç??ç?®ç??ç«¯"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??è£¡ï¼?é?¸å??è¦?å¼µè²¼ç??è³?æ??å¤¾"
 
-#: ../composer/e-composer-private.c:208
+#: ../composer/e-composer-private.c:280
 msgid "Save draft"
 msgstr "å?²å?è??ç¨¿"
 
-#: ../composer/e-msg-composer.c:808
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+#. Check buttons
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯(_D)"
+
+#: ../composer/e-msg-composer.c:983
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç?¡æ³?ç°½ç½²é??å?ºç??é?µä»¶ï¼?æ¤å¸³è??æ²?æ??è¨å®?ç°½ç« æ??è?"
 
-#: ../composer/e-msg-composer.c:815
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+#: ../composer/e-msg-composer.c:990
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??è¨å®?å? å¯?æ??è?(æ¤å¸³è??)"
 
-#: ../composer/e-msg-composer.c:1351
-#: ../composer/e-msg-composer.c:2190
+#: ../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
 msgid "Compose Message"
 msgstr "ç·¨è¼¯é?µä»¶"
 
-#: ../composer/e-msg-composer.c:3348
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
+#: ../composer/e-msg-composer.c:3310
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
 msgstr "<b>ï¼?é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å?ç??é?µä»¶å?§æ??ã??ï¼?<b>"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr "é??è£¡æ??ä¸?äº?é??ä»¶è¦?ä¸?è¼?ã??å?³é??æ¤é?µä»¶å°?ç?¡æ³?ä¸?ä½µå¯?å?ºæ?¥ä¸?ä¾?ç??é??ä»¶"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -9644,7 +8232,9 @@ msgid "All accounts have been removed."
 msgstr "æ??æ??å¸³è??å·²ç¶?ç§»é?¤ã??"
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr "ç¢ºå®?è¦?æ?¾æ£?æ£å?¨æ?°å¯«ï¼?æ¨?é¡?ç?º â??{0}â?? ç??é?µä»¶ï¼?"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -9656,8 +8246,13 @@ msgid "Because &quot;{1}&quot;."
 msgstr "å? ç?ºã??{1}ã??ã??"
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
-msgstr "é?¤é??æ?¨é?¸æ??å?²å?é?µä»¶è?³ã??è??ç¨¿ã??è³?æ??å¤¾ï¼?å?¦å??é??é??æ¤æ?°å¯«è¦?çª?æ??æ°¸ä¹?æ?¾æ£?é?µä»¶ã??å?²å?è??ç¨¿å?¯ä»¥è®?æ?¨ä»¥å¾?å??ç¹¼çº?æ?°å¯«é?µä»¶ã??"
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+"é?¤é??æ?¨é?¸æ??å?²å?é?µä»¶è?³ã??è??ç¨¿ã??è³?æ??å¤¾ï¼?å?¦å??é??é??æ¤æ?°å¯«è¦?çª?æ??æ°¸ä¹?æ?¾æ£?é?µä»¶ã??å?²å?è??"
+"ç¨¿å?¯ä»¥è®?æ?¨ä»¥å¾?å??ç¹¼çº?æ?°å¯«é?µä»¶ã??"
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
@@ -9680,97 +8275,89 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "ç?¡æ³?å?²å?è?³è?ªå??å?²å?æª?æ¡?ã??{0}ã??ã??"
 
 #: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "ç?¡æ³?é??å? ç?®é??å?°é?µä»¶ã??"
-
-#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "è¦?å¾©å??æ?ªå®?æ??ç??é?µä»¶ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "ä¸?è¼?å°?å?¨é?²è¡?ä¸ã??æ?¯å?¦å¯?å?ºé?µä»¶ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "å?²å?è?³è?ªå??å?²å?æ??ç?¼ç??é?¯èª¤ï¼?å? ç?ºã??{1}ã??ã??"
 
-#: ../composer/mail-composer.error.xml.h:16
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
-msgstr "ç?¶æ?¨æ?°å¯«æ?°é?µä»¶æ??ï¼?Evolution æ??å¤?çµ?æ??ã??å¾©å??é?µä»¶å?¯ä»¥è®?æ?¨å¾?å??ä¾?ä¸æ?·ç??å?°æ?¹ç¹¼çº?ã??"
-
-#: ../composer/mail-composer.error.xml.h:17
-msgid "Send options available only for Novell GroupWise and Microsoft Exchange accounts."
-msgstr "å?³é??å??ç?¨æ?¼ Novell GroupWise è?? Microsoft Exchange å¸³è??ç??é?¸é ?ã??"
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "å?³é??é?¸é ?ç?¡æ³?ä½¿ç?¨ã??"
+#: ../composer/mail-composer.error.xml.h:15
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"ç?¶æ?¨æ?°å¯«æ?°é?µä»¶æ??ï¼?Evolution æ??å¤?çµ?æ??ã??å¾©å??é?µä»¶å?¯ä»¥è®?æ?¨å¾?å??ä¾?ä¸æ?·ç??å?°æ?¹ç¹¼çº?ã??"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../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}' ä¸?æ?¯ä¸?è?¬æª?æ¡?è??ä¸?ç?¡æ³?å?¨é?µä»¶ä¸å?³é??ã??"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
-msgstr "è¦?é??å? æ¤ç?®é??ç??å?§å®¹ï¼?è«?å??å?¥é??å? æ¤ç?®é??ä¸ç??æª?æ¡?ï¼?æ??è??å»ºç«?ç?®é??ç??æ¸æª?å??å? ä»¥é??å? å®?ã??"
-
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 "ç?¡æ³?å??å?? HTML ç·¨è¼¯å?¨æ?§å?¶ã??\n"
 "\n"
 "è«?ç¢ºå®?æ?¨å®?è£?ç??æ?¯æ£ç¢ºç??gtkhtml å?? libgtkhtml ç??æ?¬ã??"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "ç?¡æ³?å??å??å?°å??é?¸æ??å?¨æ?§å?¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "Unfinished messages found"
-msgstr "æ?¾å?°æ?ªå®?æ??ç??é?µä»¶"
-
-#: ../composer/mail-composer.error.xml.h:26
-msgid "Warning: Modified Message"
-msgstr "è¦å??ï¼?ç·¨è¼¯é??ç??é?µä»¶"
-
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:21
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "æ?¨ç?¡æ³?å°?æª?æ¡? â??{0}â?? é??å? å?°æ¤é?µä»¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "æ?°å¯«é?µä»¶å??ï¼?æ?¨é??è¦?å??è¨å®?å¸³è??ã??"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "ç¹¼çº?ç·¨è¼¯(_C)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "ä¸?è¦?å¾©å??(_D)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "å¾©å??(_R)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "å?²å?è??ç¨¿(_S)"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
+msgstr "è¡?äº?æ??äº?ä»¶é??ç?¥"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr "Evolution é¬§é?´é??ç?¥"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
+#: ../shell/e-shell-window-private.c:255
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution é?µä»¶è??è¡?äº?æ??"
 
-#: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:947
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
 msgid "Groupware Suite"
 msgstr "Groupware å¥?è£?è»?é«?"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "ç®¡ç??æ?¨ç??é?µä»¶ã??é?£çµ¡äººå??è¡?ç¨?"
 
@@ -9782,17 +8369,126 @@ msgstr "å?°å??å?¡"
 msgid "calendar information"
 msgstr "è¡?äº?æ??è³?è¨?"
 
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s ï¼?å·²å??æ¶?ï¼?"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (completed)"
+msgstr "%s ï¼?å·²å®?æ??ï¼? "
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, c-format
+msgid "%s..."
+msgstr "%s..."
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% å®?æ??)"
+
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "Evolution é?¯èª¤"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "Evolution è¦å??"
+
+#: ../e-util/e-alert.c:634
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "é?¿æ??ä¼¯æ??"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "æ³¢ç¾?ç??æµ·èª?ç³»"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "ä¸æ?èª?ç³»"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "ä¸æ??"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "æ?¯æ??å¤«èª?ç³»"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "å¸?è??æ??"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "å¸?ä¼¯ä¾?æ??"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "æ?¥æ??"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "é??æ??"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "æ³°æ??"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "å??è?³å?¶æ??"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "è?¬å??ç¢¼"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "è¥¿æ?èª?ç³»"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "è¥¿æ?èª?ç³»ï¼?æ?°"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+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
+msgid "Simplified"
+msgstr "ç°¡é«?"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "ç??å??è?èª?"
+
+#: ../e-util/e-charset.c:97
+msgid "Visual"
+msgstr "è¦?è¦º"
+
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../plugins/itip-formatter/itip-view.c:191
-#: ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:304
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../plugins/itip-formatter/itip-view.c:195
+#: ../widgets/table/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "ä»?å¤©"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202
-#: ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "æ??å¤©"
 
@@ -9810,8 +8506,7 @@ msgstr "å¾?ç?¾å?¨èµ· %d å¤©"
 msgid "%d days ago"
 msgstr "%d å¤©å??"
 
-#: ../e-util/e-datetime-format.c:283
-#: ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
 #: ../e-util/e-datetime-format.c:302
 msgid "Use locale default"
 msgstr "ä½¿ç?¨å?°å??è¨å®?é ?è¨å?¼"
@@ -9820,109 +8515,95 @@ msgstr "ä½¿ç?¨å?°å??è¨å®?é ?è¨å?¼"
 msgid "Format:"
 msgstr "æ ¼å¼?ï¼?"
 
-#: ../e-util/e-error.c:78
-#: ../e-util/e-error.c:79
-#: ../e-util/e-error.c:121
-msgid "Evolution Error"
-msgstr "Evolution é?¯èª¤"
-
-#: ../e-util/e-error.c:80
-#: ../e-util/e-error.c:81
-#: ../e-util/e-error.c:119
-msgid "Evolution Warning"
-msgstr "Evolution è¦å??"
-
-#: ../e-util/e-error.c:118
-msgid "Evolution Information"
-msgstr "Evolution è³?è¨?"
+#: ../e-util/e-file-utils.c:136
+msgid "(Unknown Filename)"
+msgstr "ï¼?ä¸?æ??ç??æª?æ¡?å??ç¨±ï¼?"
 
-#: ../e-util/e-error.c:120
-msgid "Evolution Query"
-msgstr "Evolution æ?¥è©¢"
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:140
+#, c-format
+msgid "Writing \"%s\""
+msgstr "æ£å?¨å¯«å?¥ã??%sã??"
 
-#. setup a dummy error
-#: ../e-util/e-error.c:448
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:145
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
+msgid "Writing \"%s\" to %s"
+msgstr "æ£å?¨å¯«å?¥ã??%sã??è?³ %s"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "å??ä»¶"
+#: ../e-util/e-logger.c:175
+msgid "Name of the logger"
+msgstr "è¨?é??å?¨å??ç¨±"
 
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
-msgstr "å·²ç?»å?¥å??ä»¶ç??å??ç¨±"
+#: ../e-util/e-module.c:188
+msgid "Filename"
+msgstr "æª?æ¡?å??ç¨±"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:191
+#: ../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 "é?¤é?¯ç´?é??æª?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:205
+#: ../e-util/e-non-intrusive-error-dialog.c:208
 msgid "Show _errors in the status bar for"
 msgstr "å?¨ç??æ??å??é¡¯ç¤ºæ¤é?¯èª¤(_E)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:223
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "ç§?ã??"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:229
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "ç´?é??æª?è¨?æ?¯:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:274
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "ç´?é??ç?ç´?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:380
-msgid "Time"
-msgstr "æ??é??"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:292
-#: ../mail/message-list.c:2527
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "é?µä»¶"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1430
 msgid "Close this window"
 msgstr "é??é??æ?¬è¦?çª?"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "é?¯èª¤"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "é?¯èª¤"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "è¦å??è??é?¯èª¤"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "å?µé?¯"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "é?¯èª¤ã??è¦å??è??é?¤é?¯è¨?æ?¯"
 
-#: ../e-util/e-plugin.c:308
-#: ../filter/rule-editor.c:798
-#: ../mail/em-account-prefs.c:477
-#: ../mail/em-composer-prefs.c:957
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:718
+#: ../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:309
+#: ../e-util/e-plugin.c:296
 msgid "Whether the plugin is enabled"
 msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
 
@@ -9935,15 +8616,15 @@ msgid "The printing system reported the following details about the error:"
 msgstr "å??å?°ç³»çµ±å??å ±ä¸?å??é??æ?¼æ¤é?¯èª¤ç??è©³ç´°è³?è¨?ï¼?"
 
 #: ../e-util/e-print.c:173
-msgid "The printing system did not report any additional details about the error."
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "å??å?°ç³»çµ±æ²?æ??å??å ±ä»»ä½?é??æ?¼æ¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
 
-#: ../e-util/e-signature.c:695
+#: ../e-util/e-signature.c:699
 msgid "Autogenerated"
 msgstr "è?ªå??ç?¢ç??ç??"
 
-#: ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "å? ç?ºã??{1}ã??ã??"
 
@@ -9963,257 +8644,303 @@ msgstr "è¦?è¦?å¯«å®??"
 msgid "File exists \"{0}\"."
 msgstr "æª?æ¡?å·²å?å?¨ã??{0}ã??ã??"
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "è¦?è??æª?æ¡?ï¼?"
-
-#: ../e-util/e-system.error.xml.h:7
-#: ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "è¦?å¯«(_O)"
 
-#: ../e-util/e-util.c:133
+#: ../e-util/e-util.c:140
 msgid "Could not open the link."
 msgstr "ç?¡æ³?é??å??è©²é?£çµ?ã??"
 
-#: ../e-util/e-util.c:183
+#: ../e-util/e-util.c:190
 msgid "Could not display help for Evolution."
 msgstr "ç?¡æ³?é¡¯ç¤º Evolution ç??æ±?å?©æ??ä»¶ã??"
 
-#: ../e-util/e-util-labels.c:45
-msgid "I_mportant"
-msgstr "é??è¦?(_M)"
+#: ../e-util/gconf-bridge.c:1276
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf é?¯èª¤ï¼?%s"
 
-#. red
-#: ../e-util/e-util-labels.c:46
-msgid "_Work"
-msgstr "å·¥ä½?(_W)"
+#: ../e-util/gconf-bridge.c:1287
+msgid "All further errors shown only on terminal."
+msgstr "æ??æ??é?²ä¸?æ¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?ç«¯æ©?ä¸é¡¯ç¤ºã??"
 
-#. orange
-#: ../e-util/e-util-labels.c:47
-msgid "_Personal"
-msgstr "å??äºº(_P)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "å??è¦?"
 
-#. green
-#: ../e-util/e-util-labels.c:48
-msgid "_To Do"
-msgstr "å¾?è¾¦äº?é ?(_T)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:961
+#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
+#: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "å?¯æ?¬"
 
-#. blue
-#: ../e-util/e-util-labels.c:49
-msgid "_Later"
-msgstr "ç¨?å¾?(_L)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
+#: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "å¯?ä»¶å?¯æ?¬"
 
-#: ../e-util/e-util-labels.c:320
-msgid "Label _Name:"
-msgstr "æ¨?ç±¤å??ç¨±(_N):"
+#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:963
+#: ../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
+msgid "Subject"
+msgstr "ä¸»æ?¨"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Edit Label"
-msgstr "ç·¨è¼¯æ¨?ç±¤"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2422
+#: ../modules/mail/em-mailer-prefs.c:1130
+msgid "Mailer"
+msgstr "å¯?ä»¶è??"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Add Label"
-msgstr "å? å?¥æ¨?ç±¤"
+#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1227
+msgid "-------- Forwarded Message --------"
+msgstr "-------- è½?é??ç??é?µä»¶ --------"
+
+#: ../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
+msgid "Date"
+msgstr "æ?¥æ??"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label name cannot be empty."
-msgstr "æ¨?ç±¤ç??å??ç¨±ä¸?è?½ç©ºç?½ã??"
+#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "æ?°è??ç¾¤çµ?"
 
-#: ../e-util/e-util-labels.c:367
-msgid "A label having the same tag already exists on the server. Please rename your label."
-msgstr "ä¼ºæ??å?¨ä¸?å·²å?å?¨å??æ¨£ç??æ¨?ç±¤ã??è«?æ?´æ?¹æ?¨ç??æ¨?ç±¤å??ç¨±ã??"
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "é?¢è²?"
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../em-format/em-format.c:1319
 #, c-format
-msgid "GConf error: %s"
-msgstr "GConf é?¯èª¤ï¼?%s"
+msgid "%s attachment"
+msgstr "%s é??ä»¶"
 
-#: ../e-util/gconf-bridge.c:1233
-msgid "All further errors shown only on terminal."
-msgstr "æ??æ??é?²ä¸?æ¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?ç«¯æ©?ä¸é¡¯ç¤ºã??"
+#: ../em-format/em-format.c:1374
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
+
+#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "ç?¡æ³?è§£æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
+
+#: ../em-format/em-format.c:1520
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message"
+msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
+
+#: ../em-format/em-format.c:1698
+msgid "Unsupported signature format"
+msgstr "ä¸?æ?¯æ?´ç??ç°½å??æ ¼å¼?"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+msgid "Error verifying signature"
+msgstr "æª¢é©?ç°½å??ç?¼ç??é?¯èª¤"
 
-#: ../filter/filter-datespec.c:73
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
+#: ../em-format/em-format.c:1847
+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:1924
+msgid "Could not parse PGP message: Unknown error"
+msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
+
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ç§?å??"
 msgstr[1] "%d ç§?å??"
 
-#: ../filter/filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 ç§?å¾?"
 msgstr[1] "%d ç§?å¾?"
 
-#: ../filter/filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 å??é??å¾?"
 msgstr[1] "%d å??é??å¾?"
 
-#: ../filter/filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 å°?æ??å¾?"
 msgstr[1] "%d å°?æ??å¾?"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 æ?¥å??"
 msgstr[1] "%d æ?¥å??"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 å¤©å¾?"
 msgstr[1] "%d å¤©å¾?"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 é?±å¾?"
 msgstr[1] "%d é?±å¾?"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 å??æ??å¾?"
 msgstr[1] "%d å??æ??å¾?"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 å¹´å¾?"
 msgstr[1] "%d å¹´å¾?"
 
-#: ../filter/filter-datespec.c:294
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
 
-#: ../filter/filter-datespec.c:297
-#: ../filter/filter-datespec.c:308
-#: ../filter/filter-datespec.c:319
+#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "ç?¾å?¨"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:304
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
-#: ../filter/filter-datespec.c:447
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
-#: ../filter/filter-file.c:281
-msgid "Choose a file"
-msgstr "é?¸æ??ä¸?å??æª?æ¡?"
-
-#: ../filter/filter-part.c:528
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "æ¸¬è©¦"
+#: ../filter/e-filter-file.c:184
+msgid "Choose a File"
+msgstr "é?¸æ??æª?æ¡?"
 
-#: ../filter/filter-rule.c:854
+#: ../filter/e-filter-rule.c:653
 msgid "R_ule name:"
 msgstr "è¦?å??å??ç¨±(_U):"
 
-#: ../filter/filter-rule.c:882
+#: ../filter/e-filter-rule.c:682
 msgid "Find items that meet the following conditions"
 msgstr "å°?æ?¾ç¬¦å??ä¸?å??æ¢?ä»¶ç??é ?ç?®"
 
-#: ../filter/filter-rule.c:916
+#: ../filter/e-filter-rule.c:716
 msgid "A_dd Condition"
 msgstr "å? å?¥æ¢?ä»¶(_D)"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:722
 msgid "If all conditions are met"
 msgstr "å¦?æ??å?¨é?¨æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "å¦?æ??ä»»ä½?æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/filter-rule.c:924
+#: ../filter/e-filter-rule.c:724
 msgid "_Find items:"
 msgstr "å°?æ?¾é ?ç?®(_F):"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:745
 msgid "All related"
 msgstr "æ??æ??ç?¸é??ç??"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:745 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "å??è¦?"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:745
 msgid "Replies and parents"
 msgstr "å??è¦?å??ç?¶ä»£"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:745
 msgid "No reply or parent"
 msgstr "æ²?æ??å??å¾©æ??å??å§?é?µä»¶"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/e-filter-rule.c:747
 msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾¤çµ?(_N)"
 
-#: ../filter/filter-rule.c:1038
-#: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/e-filter-rule.c:1120 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:301
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/filter-rule.c:1038
-#: ../mail/em-utils.c:310
+#: ../filter/e-filter-rule.c:1120 ../mail/em-utils.c:302
 msgid "Outgoing"
 msgstr "å¤?å¯?"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "æ?°å¢?è¦?å??"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "ç·¨è¼¯è¦?å??"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "é?¯èª¤ç??æ£è¦?è¡¨ç¤ºå¼?ã??{0}ã??ã??"
@@ -10234,8 +8961,7 @@ msgstr "ç¼ºå°?æ?¥æ??ã??"
 msgid "Missing file name."
 msgstr "ç¼ºå°?æª?æ¡?å??ç¨±ã??"
 
-#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
 msgid "Missing name."
 msgstr "ç¼ºå°?å??ç¨±ã??"
 
@@ -10259,19 +8985,15 @@ msgstr "æ?¨å¿?é ?ç?ºé??å??é??æ¿¾å?¨å?½å??ã??"
 msgid "You must specify a file name."
 msgstr "æ?¨å¿?é ?æ??å®?ä¸?å??æª?æ¡?å??ç¨±ã??"
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>é??æ¿¾å?¨è¦?å??(_F)</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "æ¯?è¼?"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "é¡¯ç¤ºé?µä»¶é??æ¿¾å?¨:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10279,7 +9001,7 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??æ?¨å?¨é??è£¡æ??å®?\n"
 "æ?¥æ??ç?? 12:00am å??æ¯?è¼?ã??"
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10287,7 +9009,7 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??ç?¸å°?æ?¼é??æ¿¾å?¨å?·è¡?\n"
 "ç??æ??é??ä½?æ¯?è¼?ã??"
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10295,241 +9017,910 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??é??æ¿¾å?¨å?·è¡?æ??ç??\n"
 "æ??é??ä½?æ¯?è¼?ã??"
 
-#: ../filter/filter.glade.h:12
-msgid ""
-"ago\n"
-"in the future"
-msgstr ""
-"ä¹?å??\n"
-"ä¹?å¾?"
-
-#: ../filter/filter.glade.h:14
-msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
-msgstr ""
-"ç§?\n"
-"å??\n"
-"æ??\n"
-"å¤©\n"
-"é?±\n"
-"æ??\n"
-"å¹´"
-
-#: ../filter/filter.glade.h:21
-msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
-msgstr ""
-"ç?®å??ç??æ??å?»\n"
-"æ?¨æ??å®?ç??æ??å?»\n"
-"ç?¸å°?æ?¼ç?®å??æ??å?»ç??æ??å·®"
-
-#: ../filter/rule-editor.c:381
-msgid "Add Rule"
-msgstr "æ?°å¢?è¦?å??"
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "é??æ¿¾å?¨è¦?å??(_F)"
 
-#: ../filter/rule-editor.c:462
-msgid "Edit Rule"
-msgstr "ç·¨è¼¯è¦?å??"
+#: ../filter/filter.ui.h:12
+msgid "a time relative to the current time"
+msgstr "ç?¸å°?æ?¼ç?®å??æ??å?»ç??æ??å·®"
 
-#: ../filter/rule-editor.c:808
-msgid "Rule name"
-msgstr "è¦?å??å??ç¨±"
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "å??"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "é?µä»¶ç·¨è¼¯å?¨å??å¥½è¨å®?"
+#: ../filter/filter.ui.h:16
+msgid "in the future"
+msgstr "å¾?"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
-msgstr "å?¨æ¤è¨å®?é?µä»¶ç??å??å¥½è¨å®?ï¼?å??å?«å®?å?¨æ?§è??é?µä»¶ç??é¡¯ç¤º"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "å?¨æ¤è¨å®?æ?¼å?æª¢æ?¥ã??ç°½å??æª?è??é?µä»¶ç·¨è¼¯å?¨"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "å?¨æ¤è¨å®?æ?¨ç??é?µä»¶å¸³è??"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "å?¨æ¤è¨å®?æ?¨ç??ç¶²è·¯é?£ç·?è¨å®?å?¼"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution é?µä»¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution é?µä»¶å¸³è??çµ?æ??æ?§å?¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution é?µä»¶é??ä»¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution é?µä»¶æ?°å¯«å?¨"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution é?µä»¶æ?°å¯«å?¨çµ?æ??æ?§å?¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution é?µä»¶å?ªå??è¨å®?æ?§å?¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "Evolution ç¶²è·¯çµ?æ??æ?§å?¶"
-
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/em-folder-view.c:602
-#: ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:620
-#: ../mail/mail-component.c:621
-#: ../mail/mail-component.c:793
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "é?µä»¶"
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "å??æ??"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:490
-msgid "Mail Accounts"
-msgstr "é?µä»¶å¸³è??"
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+msgid "seconds"
+msgstr "ç§?"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:108
-msgid "Mail Preferences"
-msgstr "é?µä»¶å??å¥½è¨å®?"
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "ç?®å??ç??æ??å?»"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "ç¶²è·¯å??å¥½è¨å®?"
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "æ?¨æ??å®?ç??æ??å?»"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:297
-msgid "_Mail"
-msgstr "é?µä»¶(_M)"
-
-#: ../mail/e-attachment-handler-mail.c:133
-#: ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:501
-#: ../ui/evolution-mail-message.xml.h:105
-msgid "_Forward"
-msgstr "è½?å¯?(_F)"
-
-#: ../mail/e-attachment-handler-mail.c:147
-#: ../mail/em-folder-view.c:1329
-#: ../ui/evolution-mail-message.xml.h:123
-msgid "_Reply to Sender"
-msgstr "å??è¦?å¯?ä»¶è??(_R)"
+#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:498
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:519
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-source.c:742
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "é?±"
 
-#. Translators: This is only for multiple messages.
-#: ../mail/e-attachment-handler-mail.c:334
-#, c-format
-msgid "%d attached messages"
-msgstr "%d å??é??å? ç??é?µä»¶"
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:122
-#: ../mail/em-format-html-display.c:1642
-#: ../mail/message-list.etspec.h:1
+#: ../mail/e-mail-attachment-bar.c:119 ../mail/em-format-html-display.c:1025
+#: ../mail/mail-config.ui.h:13 ../mail/message-list.etspec.h:1
 #: ../widgets/misc/e-attachment-paned.c:147
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??ä»¶"
 msgstr[1] "é??ä»¶"
 
-#: ../mail/e-mail-attachment-bar.c:615
+#: ../mail/e-mail-attachment-bar.c:612
 #: ../widgets/misc/e-attachment-paned.c:607
 msgid "Icon View"
 msgstr "å??ç¤ºæª¢è¦?"
 
-#: ../mail/e-mail-attachment-bar.c:616
+#: ../mail/e-mail-attachment-bar.c:613
 #: ../widgets/misc/e-attachment-paned.c:608
 msgid "List View"
 msgstr "æ¸?å?®æª¢è¦?"
 
-#: ../mail/e-mail-search-bar.c:76
+#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:628
+msgid "Focus Tracker"
+msgstr "ç?¦é»?è¿½è¹¤å?¨"
+
+#: ../mail/e-mail-browser.c:739
+msgid "Shell Module"
+msgstr "Shell æ¨¡çµ?"
+
+#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
+msgid "The mail shell backend"
+msgstr "é?µä»¶ shell å¾?ç«¯ç¨?å¼?"
+
+#: ../mail/e-mail-browser.c:750
+msgid "Show Deleted"
+msgstr "é¡¯ç¤ºå·²å?ªé?¤"
+
+#: ../mail/e-mail-browser.c:751
+msgid "Show deleted messages"
+msgstr "é¡¯ç¤ºå·²å?ªé?¤é?µä»¶"
+
+#: ../mail/e-mail-display.c:66
+msgid "_Add to Address Book..."
+msgstr "å? å?¥å?°é??è¨?é??(_A)..."
+
+#: ../mail/e-mail-display.c:73
+msgid "_To This Address"
+msgstr "å?°é??å??ä½?å??(_T)"
+
+#: ../mail/e-mail-display.c:80
+msgid "_From This Address"
+msgstr "å¾?é??å??ä½?å??(_F)"
+
+#: ../mail/e-mail-display.c:89
+msgid "Create Search _Folder"
+msgstr "å»ºç«?æ??å°?è³?æ??å¤¾(_F)"
+
+#: ../mail/e-mail-label-dialog.c:220
+msgid "_Label name:"
+msgstr "æ¨?ç±¤å??ç¨±(_L):"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "é??è¦?(_M)"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "å·¥ä½?(_W)"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "å??äºº(_P)"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "å¾?è¾¦äº?é ?(_T)"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "ç¨?å¾?(_L)"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:505
+msgid "Add Label"
+msgstr "å? å?¥æ¨?ç±¤"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "ç·¨è¼¯æ¨?ç±¤"
+
+#: ../mail/e-mail-label-manager.c:349
+msgid ""
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr ""
+"æ³¨æ??ï¼?å?¨æ¨?ç±¤å??ç¨±ä¸ç??åº?ç·?æ?¯ç?¨ä¾?\n"
+"æ¨?è¨?é?¸å?®ä¸ç??æ?·å¾?é?µã??"
+
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "é¡?è?²"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2570
+#: ../modules/mail/e-mail-shell-view-private.c:908
+msgid "Inbox"
+msgstr "æ?¶ä»¶å?£"
+
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
+msgid "Drafts"
+msgstr "è??ç¨¿"
+
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
+msgid "Outbox"
+msgstr "å¯?ä»¶å?£"
+
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
+msgid "Sent"
+msgstr "å·²å?³é??"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:574
+msgid "Templates"
+msgstr "ç¯?æ?¬"
+
+#: ../mail/e-mail-migrate.c:953 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "é??è¦?"
+
+#. green
+#: ../mail/e-mail-migrate.c:956
+msgid "To Do"
+msgstr "å¾?è¾¦"
+
+#. blue
+#: ../mail/e-mail-migrate.c:957
+msgid "Later"
+msgstr "ç¨?å¾?"
+
+#: ../mail/e-mail-migrate.c:1103
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+msgid "Migrating..."
+msgstr "æ£å?¨ç§»è½?..."
+
+#: ../mail/e-mail-migrate.c:1136
+msgid "Migration"
+msgstr "ç§»è½?"
+
+#: ../mail/e-mail-migrate.c:1176
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
 #, c-format
-msgid "Matches: %d"
-msgstr "ç¬¦å??ï¼?%d"
+msgid "Migrating '%s':"
+msgstr "æ£å?¨ç§»è½?ã??%sã??ï¼?"
 
-#: ../mail/e-mail-search-bar.c:520
-msgid "Close the find bar"
-msgstr "é??é??æ??å°?å·¥å?·å??"
+#: ../mail/e-mail-migrate.c:1586
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "ç?¡æ³?å»ºç«?æ?°è³?æ??å¤¾ `%s'ï¼?%s"
 
-#: ../mail/e-mail-search-bar.c:528
-msgid "Fin_d:"
-msgstr "å°?æ?¾(_D):"
+#: ../mail/e-mail-migrate.c:1614
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "ç?¡æ³?è¤?è£½è£½è³?æ??å¤¾ `%s' è?³ `%s'ï¼?%s"
 
-#: ../mail/e-mail-search-bar.c:540
-msgid "Clear the search"
-msgstr "æ¸?é?¤æ¤æ??å°?"
+#: ../mail/e-mail-migrate.c:1809
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
 
-#: ../mail/e-mail-search-bar.c:559
-msgid "_Previous"
-msgstr "ä¸?ä¸?å??(_P)"
+#: ../mail/e-mail-migrate.c:1815 ../mail/e-mail-migrate.c:2912
+msgid "Migrating Folders"
+msgstr "æ£å?¨è½?ç§»è³?æ??å¤¾"
 
-#: ../mail/e-mail-search-bar.c:565
-msgid "Find the previous occurrence of the phrase"
-msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
+#: ../mail/e-mail-migrate.c:1816
+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 ""
+"Evolution ä¿¡ç®±è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
 
-#: ../mail/e-mail-search-bar.c:573
-msgid "_Next"
-msgstr "ä¸?ä¸?å??(_N)"
+#: ../mail/e-mail-migrate.c:2019
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/e-mail-search-bar.c:579
-msgid "Find the next occurrence of the phrase"
-msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
+#: ../mail/e-mail-migrate.c:2035
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "ç?¡æ³?å»ºç«? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
 
-#: ../mail/e-mail-search-bar.c:587
-msgid "Mat_ch case"
-msgstr "å??å??å¤§å°?å¯«(_C)"
+#: ../mail/e-mail-migrate.c:2067
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "ç?¡æ³?è¤?è£½ POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
 
-#: ../mail/e-mail-search-bar.c:615
-msgid "Reached bottom of page, continued from top"
-msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?ç«¯ç¹¼çº?"
+#: ../mail/e-mail-migrate.c:2538 ../mail/e-mail-migrate.c:2552
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "ç?¡æ³?å»ºç«?æ?¬å?°é?µä»¶å?²å?å?? `%s':%s"
 
-#: ../mail/e-mail-search-bar.c:637
-msgid "Reached top of page, continued from bottom"
-msgstr "å?°é??é ?é?¢é ?ç«¯ï¼?å¾?åº?é?¨ç¹¼çº?"
+#: ../mail/e-mail-migrate.c:2913
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution ä¿¡ç®±è³?æ??å¤¾ç??æ??è¦?æ ¼å¼?å¾? Evolution 2.24 å¾?è½?æ??ç?º SQLiteã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-migrate.c:2928 ../mail/e-mail-store.c:229
+#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
+#: ../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
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "æ??ç??é?»è?¦"
+
+#: ../mail/e-mail-migrate.c:3008
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "ç?¡æ³?å?¨ `%s' å»ºç«?æ?¬å?°é?µä»¶è³?æ??å¤¾:%s"
+
+#: ../mail/e-mail-migrate.c:3026
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"ç?¡æ³?å¾?ä»¥å??ç?? Evolution è®?å??è¨å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å?å?¨æ??æ??æ¯?ã??"
+
+#. 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:580
+msgid "Do not ask me again"
+msgstr "ä¸?è¦?å??è©¢å??æ??"
+
+#: ../mail/e-mail-reader.c:194 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "è¤?è£½è?³è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:194 ../mail/em-folder-utils.c:382
+msgid "C_opy"
+msgstr "è¤?è£½(_O)"
+
+#: ../mail/e-mail-reader.c:568 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "ç§»è?³è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:568 ../mail/em-folder-utils.c:382
+msgid "_Move"
+msgstr "ç§»å??(_M)"
+
+#: ../mail/e-mail-reader.c:794
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "å?²å?é?µä»¶"
+msgstr[1] "å?²å?é?µä»¶"
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:815 ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:518
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "é?µä»¶"
+msgstr[1] "é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1073
+msgid "A_dd Sender to Address Book"
+msgstr "å? å?¥å¯?ä»¶è??å?°ç?®é??æ??å??(_D)"
+
+#: ../mail/e-mail-reader.c:1075
+msgid "Add sender to address book"
+msgstr "æ?°å¢?å¯?ä»¶è??è?³é??è¨?é??"
+
+#: ../mail/e-mail-reader.c:1080
+msgid "Check for _Junk"
+msgstr "æª¢æ?¥å??å?¾é?µä»¶(_J)"
+
+#: ../mail/e-mail-reader.c:1082
+msgid "Filter the selected messages for junk status"
+msgstr "ç¯©é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
+
+#: ../mail/e-mail-reader.c:1087
+msgid "_Copy to Folder..."
+msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)..."
+
+#: ../mail/e-mail-reader.c:1089
+msgid "Copy selected messages to another folder"
+msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1094
+msgid "_Delete Message"
+msgstr "å?ªé?¤é?µä»¶(_D)"
+
+#: ../mail/e-mail-reader.c:1096
+msgid "Mark the selected messages for deletion"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??è¦?å?ªé?¤"
+
+#: ../mail/e-mail-reader.c:1101
+msgid "Filter on Mailing _List..."
+msgstr "é??ä¿¡è«?å£?é??æ¿¾å?¨(_L)..."
+
+#: ../mail/e-mail-reader.c:1103
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨è¦?å??"
+
+#: ../mail/e-mail-reader.c:1108
+msgid "Filter on _Recipients..."
+msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_R)..."
+
+#: ../mail/e-mail-reader.c:1110
+msgid "Create a rule to filter messages to these recipients"
+msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
+
+#: ../mail/e-mail-reader.c:1115
+msgid "Filter on Se_nder..."
+msgstr "å¯?ä»¶è??é??æ¿¾å?¨(_N)..."
+
+#: ../mail/e-mail-reader.c:1117
+msgid "Create a rule to filter messages from this sender"
+msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
+
+#: ../mail/e-mail-reader.c:1122
+msgid "Filter on _Subject..."
+msgstr "ä¸»æ?¨é??æ¿¾å?¨(_S)..."
+
+#: ../mail/e-mail-reader.c:1124
+msgid "Create a rule to filter messages with this subject"
+msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?é??æ¿¾å?¨è¦?å??"
+
+#: ../mail/e-mail-reader.c:1129
+msgid "A_pply Filters"
+msgstr "å¥?ç?¨é??æ¿¾å?¨(_P)"
+
+#: ../mail/e-mail-reader.c:1131
+msgid "Apply filter rules to the selected messages"
+msgstr "å¥?ç?¨é??æ¿¾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1136
+msgid "_Find in Message..."
+msgstr "å?¨é?µä»¶å?§å°?æ?¾(_F)..."
+
+#: ../mail/e-mail-reader.c:1138
+msgid "Search for text in the body of the displayed message"
+msgstr "æ??å°?é¡¯ç¤ºç??é?µä»¶æ?¬æ??ä¸ç??æ??å?"
+
+#: ../mail/e-mail-reader.c:1143
+msgid "_Clear Flag"
+msgstr "æ¸?é?¤æ¨?å¹?(_C)"
+
+#: ../mail/e-mail-reader.c:1145
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "ç§»é?¤é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?"
+
+#: ../mail/e-mail-reader.c:1150
+msgid "_Flag Completed"
+msgstr "æ¨?è¨?ç?ºå·²å®?æ??(_F)"
+
+#: ../mail/e-mail-reader.c:1152
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "å°?å·²é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?è¨ç?ºå·²å®?æ??"
+
+#: ../mail/e-mail-reader.c:1157
+msgid "Follow _Up..."
+msgstr "è·?é?¨(_U)..."
+
+#: ../mail/e-mail-reader.c:1159
+msgid "Flag the selected messages for follow-up"
+msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ??æ¨?"
+
+#: ../mail/e-mail-reader.c:1164
+msgid "_Attached"
+msgstr "é??ä»¶(_A)"
+
+#: ../mail/e-mail-reader.c:1166 ../mail/e-mail-reader.c:1173
+msgid "Forward the selected message to someone as an attachment"
+msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??ä»¶å½¢å¼?è½?å¯?çµ¦æ??äºº"
+
+#: ../mail/e-mail-reader.c:1171
+msgid "Forward As _Attached"
+msgstr "ä»¥é??ä»¶è½?å¯?(_A)"
+
+#: ../mail/e-mail-reader.c:1178
+msgid "_Inline"
+msgstr "è¡?å?§(_I)"
+
+#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
+msgid "Forward the selected message in the body of a new message"
+msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??ä¸"
+
+#: ../mail/e-mail-reader.c:1185
+msgid "Forward As _Inline"
+msgstr "ä»¥è¡?å?§è½?å¯?(_I)"
+
+#: ../mail/e-mail-reader.c:1192
+msgid "_Quoted"
+msgstr "å¼?æ??(_Q)"
+
+#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
+msgid "Forward the selected message quoted like a reply"
+msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
+
+#: ../mail/e-mail-reader.c:1199
+msgid "Forward As _Quoted"
+msgstr "ä»¥å¼?æ??è½?å¯?(_Q)"
+
+#: ../mail/e-mail-reader.c:1206
+msgid "_Load Images"
+msgstr "è¼?å?¥å??ç??(_L)"
+
+#: ../mail/e-mail-reader.c:1208
+msgid "Force images in HTML mail to be loaded"
+msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
+
+#: ../mail/e-mail-reader.c:1213
+msgid "_Important"
+msgstr "é??è¦?(_I)"
+
+#: ../mail/e-mail-reader.c:1215
+msgid "Mark the selected messages as important"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??é??è¦?"
+
+#: ../mail/e-mail-reader.c:1220
+msgid "_Junk"
+msgstr "å??å?¾é?µä»¶(_J)"
+
+#: ../mail/e-mail-reader.c:1222
+msgid "Mark the selected messages as junk"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å??å?¾é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1227
+msgid "_Not Junk"
+msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
+
+#: ../mail/e-mail-reader.c:1229
+msgid "Mark the selected messages as not being junk"
+msgstr "å°?é?¸å??ç??é?µä»¶æ¨?ç¤ºæ??ä¸?æ?¯å??å?¾é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1234
+msgid "_Read"
+msgstr "å·²é?±è®?(_R)"
+
+#: ../mail/e-mail-reader.c:1236
+msgid "Mark the selected messages as having been read"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å·²ç¶?é?±è®?"
+
+#: ../mail/e-mail-reader.c:1241
+msgid "Uni_mportant"
+msgstr "ä¸?é??è¦?(_M)"
+
+#: ../mail/e-mail-reader.c:1243
+msgid "Mark the selected messages as unimportant"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??ä¸?é??è¦?"
+
+#: ../mail/e-mail-reader.c:1248
+msgid "_Unread"
+msgstr "æ?ªé?±è®?(_U)"
+
+#: ../mail/e-mail-reader.c:1250
+msgid "Mark the selected messages as not having been read"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??æ?ªé?±è®?"
+
+#: ../mail/e-mail-reader.c:1255
+msgid "_Edit as New Message..."
+msgstr "ç·¨è¼¯ç?ºæ?°é?µä»¶(_E)..."
+
+#: ../mail/e-mail-reader.c:1257
+msgid "Open the selected messages in the composer for editing"
+msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
+
+#: ../mail/e-mail-reader.c:1262
+msgid "Compose _New Message"
+msgstr "æ?°å¯«æ?°é?µä»¶(_N)"
+
+#: ../mail/e-mail-reader.c:1264
+msgid "Open a window for composing a mail message"
+msgstr "é??å??è¦?çª?ä»¥ä¾¿æ?°å¯«é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1269
+msgid "_Open in New Window"
+msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
+
+#: ../mail/e-mail-reader.c:1271
+msgid "Open the selected messages in a new window"
+msgstr "ä½¿ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1276
+msgid "_Move to Folder..."
+msgstr "ç§»è?³è³?æ??å¤¾(_M)..."
+
+#: ../mail/e-mail-reader.c:1278
+msgid "Move selected messages to another folder"
+msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1283
+msgid "_Next Message"
+msgstr "ä¸?ä¸?å°?é?µä»¶(_N)"
+
+#: ../mail/e-mail-reader.c:1285
+msgid "Display the next message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1290
+msgid "Next _Important Message"
+msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
+
+#: ../mail/e-mail-reader.c:1292
+msgid "Display the next important message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1297
+msgid "Next _Thread"
+msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
+
+#: ../mail/e-mail-reader.c:1299
+msgid "Display the next thread"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?ç?¸é??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1304
+msgid "Next _Unread Message"
+msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
+
+#: ../mail/e-mail-reader.c:1306
+msgid "Display the next unread message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1311
+msgid "_Previous Message"
+msgstr "ä¸?ä¸?å°?é?µä»¶(_P)"
+
+#: ../mail/e-mail-reader.c:1313
+msgid "Display the previous message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1318
+msgid "Pr_evious Important Message"
+msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
+
+#: ../mail/e-mail-reader.c:1320
+msgid "Display the previous important message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1325
+msgid "P_revious Unread Message"
+msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
+
+#: ../mail/e-mail-reader.c:1327
+msgid "Display the previous unread message"
+msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
+
+# zh_HK: msgstr "å??å?°é?µä»¶"
+#: ../mail/e-mail-reader.c:1334
+msgid "Print this message"
+msgstr "å??å?°é?µä»¶"
+
+# zh_HK: msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
+#: ../mail/e-mail-reader.c:1341
+msgid "Preview the message to be printed"
+msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1346
+msgid "Re_direct"
+msgstr "é??æ?°å°?å??(_D)"
+
+#: ../mail/e-mail-reader.c:1348
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??çµ¦æ??äºº"
+
+#: ../mail/e-mail-reader.c:1353
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "å??è¦?æ??æ??äºº(_A)"
+
+#: ../mail/e-mail-reader.c:1355
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "æ?°å¯«å??é?µçµ¦å·²é?¸å??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
+
+#: ../mail/e-mail-reader.c:1360
+msgid "Reply to _List"
+msgstr "å??è¦?è?³æ¸?å?®(_L)"
+
+#: ../mail/e-mail-reader.c:1362
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
+
+#: ../mail/e-mail-reader.c:1367
+#: ../modules/mail/e-mail-attachment-handler.c:148
+msgid "_Reply to Sender"
+msgstr "å??è¦?å¯?ä»¶è??(_R)"
+
+#: ../mail/e-mail-reader.c:1369
+msgid "Compose a reply to the sender of the selected message"
+msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?ä»¶è??"
+
+#: ../mail/e-mail-reader.c:1374
+msgid "_Save as mbox..."
+msgstr "å?²å?æ?? mbox(_S)..."
+
+#: ../mail/e-mail-reader.c:1376
+msgid "Save selected messages as an mbox file"
+msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å?æ?? mbox æª?æ¡?"
+
+#: ../mail/e-mail-reader.c:1381
+msgid "Search Folder from Mailing _List..."
+msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??å¤¾(_L)..."
+
+#: ../mail/e-mail-reader.c:1383
+msgid "Create a search folder for this mailing list"
+msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1388
+msgid "Search Folder from Recipien_ts..."
+msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??å¤¾(_T)..."
+
+#: ../mail/e-mail-reader.c:1390
+msgid "Create a search folder for these recipients"
+msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1395
+msgid "Search Folder from Sen_der..."
+msgstr "å¯?ä»¶è??æ??å°?è³?æ??å¤¾(_D)..."
+
+#: ../mail/e-mail-reader.c:1397
+msgid "Create a search folder for this sender"
+msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1402
+msgid "Search Folder from S_ubject..."
+msgstr "ä¸»æ?¨æ??å°?è³?æ??å¤¾(_U)..."
+
+#: ../mail/e-mail-reader.c:1404
+msgid "Create a search folder for this subject"
+msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1409
+msgid "_Message Source"
+msgstr "é?µä»¶ä¾?æº?(_M)"
+
+#: ../mail/e-mail-reader.c:1411
+msgid "Show the raw email source of the message"
+msgstr "é¡¯ç¤ºé?µä»¶å??å§?æª?"
+
+#: ../mail/e-mail-reader.c:1423
+msgid "_Undelete Message"
+msgstr "å¾©å??å?ªé?¤é?µä»¶(_U)"
+
+#: ../mail/e-mail-reader.c:1425
+msgid "Undelete the selected messages"
+msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1430
+msgid "_Normal Size"
+msgstr "æ£å¸¸å¤§å°?(_N)"
+
+#: ../mail/e-mail-reader.c:1432
+msgid "Reset the text to its original size"
+msgstr "é??è¨æ??å?ç?ºå??å§?å¤§å°?"
+
+#: ../mail/e-mail-reader.c:1437
+msgid "_Zoom In"
+msgstr "æ??è¿?(_Z)"
+
+#: ../mail/e-mail-reader.c:1439
+msgid "Increase the text size"
+msgstr "å°?æ??å?æ?¾å¤§"
+
+#: ../mail/e-mail-reader.c:1444
+msgid "Zoom _Out"
+msgstr "æ??é? (_O)"
+
+#: ../mail/e-mail-reader.c:1446
+msgid "Decrease the text size"
+msgstr "å°?æ??å?ç¸®å°?"
+
+#: ../mail/e-mail-reader.c:1453
+msgid "Create R_ule"
+msgstr "å»ºç«?è¦?å??(_U)"
+
+#: ../mail/e-mail-reader.c:1460
+msgid "Ch_aracter Encoding"
+msgstr "å?å??ç·¨ç¢¼(_A)"
+
+#: ../mail/e-mail-reader.c:1467
+msgid "F_orward As"
+msgstr "è½?å¯?ç?º(_O)"
+
+#: ../mail/e-mail-reader.c:1474
+msgid "_Go To"
+msgstr "ç§»è?³(_G)"
+
+#: ../mail/e-mail-reader.c:1481
+msgid "Mar_k As"
+msgstr "æ¨?ç¤ºæ??(_K)"
+
+#: ../mail/e-mail-reader.c:1488
+msgid "_Message"
+msgstr "é?µä»¶(_M)"
+
+#: ../mail/e-mail-reader.c:1495
+msgid "_Zoom"
+msgstr "ç¸®æ?¾(_Z)"
+
+#: ../mail/e-mail-reader.c:1520
+msgid "Mark for Follo_w Up..."
+msgstr "æ¨?ç¤ºç?ºè·?é?¨(_W)..."
+
+#: ../mail/e-mail-reader.c:1528
+msgid "Mark as _Important"
+msgstr "æ¨?ç¤ºæ??é??è¦?(_I)"
+
+#: ../mail/e-mail-reader.c:1532
+msgid "Mark as _Junk"
+msgstr "æ¨?ç¤ºæ??å??å?¾é?µä»¶(_J)"
+
+#: ../mail/e-mail-reader.c:1536
+msgid "Mark as _Not Junk"
+msgstr "æ¨?ç¤ºæ??é??å??å?¾é?µä»¶(_N)"
+
+#: ../mail/e-mail-reader.c:1540
+msgid "Mar_k as Read"
+msgstr "æ¨?ç¤ºæ??å·²é?±è®?(_K)"
+
+#: ../mail/e-mail-reader.c:1544
+msgid "Mark as Uni_mportant"
+msgstr "æ¨?ç¤ºæ??ä¸?é??è¦?(_M)"
+
+#: ../mail/e-mail-reader.c:1548
+msgid "Mark as _Unread"
+msgstr "æ¨?ç¤ºæ??æ?ªé?±è®?(_U)"
+
+#: ../mail/e-mail-reader.c:1584
+msgid "_Caret Mode"
+msgstr "æ¼?å?æ¨¡å¼?(_C)"
+
+#: ../mail/e-mail-reader.c:1586
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??ä¸é¡¯ç¤ºé??ç??æ¸¸æ¨?"
+
+#: ../mail/e-mail-reader.c:1592
+msgid "All Message _Headers"
+msgstr "æ??æ??é?µä»¶æª?é (_H)"
+
+#: ../mail/e-mail-reader.c:1594
+msgid "Show messages with all email headers"
+msgstr "é¡¯ç¤ºé?µä»¶å??è©³ç´°æª?é "
+
+#: ../mail/e-mail-reader.c:1813
+msgid "Unable to retrieve message"
+msgstr "ç?¡æ³?æ?¥æ?¶é?µä»¶"
+
+#: ../mail/e-mail-reader.c:1858 ../mail/mail-ops.c:1849
+#, 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:2352
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:612
+#: ../plugins/google-account-setup/google-source.c:783
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "é ?è¨å?¼"
+
+#: ../mail/e-mail-reader.c:2471
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "è½?å¯?(_F)"
+
+#: ../mail/e-mail-reader.c:2472
+msgid "Forward the selected message to someone"
+msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?çµ¦æ??äºº"
+
+#: ../mail/e-mail-reader.c:2516 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
+msgid "Delete"
+msgstr "å?ªé?¤"
+
+#: ../mail/e-mail-reader.c:2520
+#: ../modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "ä¸?ä¸?å??"
+
+#: ../mail/e-mail-reader.c:2524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "ä¸?ä¸?å??"
+
+#: ../mail/e-mail-reader.c:2528 ../mail/mail-dialogs.ui.h:18
+msgid "Reply"
+msgstr "å??è¦?"
+
+#: ../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:309
+#: ../mail/em-account-editor.c:484 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:10
 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:313
+#: ../mail/em-account-editor.c:488 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:21
 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:317
+#: ../mail/em-account-editor.c:492 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL å? å¯?"
 
-#: ../mail/em-account-editor.c:408
+#: ../mail/em-account-editor.c:579
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s æ??æ¬?å??ç´?"
 
-#: ../mail/em-account-editor.c:415
+#: ../mail/em-account-editor.c:586
 #, c-format
 msgid ""
 "\n"
@@ -10542,144 +9933,173 @@ msgstr ""
 " %s æ??æ¬?å??ç´?\n"
 "ä¸¦é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
 
-#: ../mail/em-account-editor.c:487
-#: ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "é?¸æ??è³?æ??å¤¾"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:866 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:797
+#: ../mail/em-account-editor.c:949
 msgid "Never"
 msgstr "æ°¸ä¸?"
 
-#: ../mail/em-account-editor.c:798
+#: ../mail/em-account-editor.c:950
 msgid "Always"
 msgstr "æ°¸é? "
 
-#: ../mail/em-account-editor.c:799
+#: ../mail/em-account-editor.c:951
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
-#: ../mail/em-account-editor.c:1877
-#: ../mail/mail-config.glade.h:100
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1683 ../widgets/misc/e-account-tree-view.c:124
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../mail/em-account-editor.c:2039
+msgid "Mail Configuration"
+msgstr "é?µä»¶çµ?æ??"
+
+#: ../mail/em-account-editor.c:2040
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"æ¡è¿?ä½¿ç?¨ Evolution é?µä»¶çµ?æ??å?©ç??ã??\n"
+"\n"
+"æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
+
+#: ../mail/em-account-editor.c:2042 ../mail/em-account-editor.c:2178
+#: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "èº«å??"
 
-#: ../mail/em-account-editor.c:1928
-#: ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:2043
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"è«?å?¨ä¸?é?¢è¼¸å?¥æ?¨ç??å??ç¨±å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??æ?¨å¸?æ??å?¨é??å?º"
+"ç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
+
+#: ../mail/em-account-editor.c:2045 ../mail/em-account-editor.c:2215
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2216
+#: ../mail/em-account-editor.c:2046
+msgid "Please configure the following account settings."
+msgstr "è«?å?¨è¨å®?ä¸?å??å¸³è??ç??è¨å®?å?¼ã??"
+
+#: ../mail/em-account-editor.c:2048 ../mail/em-account-editor.c:2692
+msgid "Sending Email"
+msgstr "å?³é??é?»å?é?µä»¶"
+
+#: ../mail/em-account-editor.c:2049
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??æ?¨ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²è·¯æ??å??ä¾?"
+"æ??å??ã??"
+
+#: ../mail/em-account-editor.c:2051
+msgid "Account Management"
+msgstr "å¸³è??ç¸½ç®¡"
+
+#: ../mail/em-account-editor.c:2052
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"è«?å?¨ä¸?é?¢ç??ç©ºé??è¼¸å?¥æ??è¿°é??å??å¸³è??ç??å??ç¨±ã??\n"
+"é??å??å??ç¨±å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
+
+#: ../mail/em-account-editor.c:2056
+msgid "Done"
+msgstr "å®?æ??"
+
+#: ../mail/em-account-editor.c:2057
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"æ?å??æ?¨ï¼?é?µä»¶è¨å®?å·²ç¶?å®?æ??ã??\n"
+"\n"
+"æ?¨ç?¾å?¨å?¯ä»¥é??å§?ä½¿ç?¨ Evolution æ?¶ç?¼é?»å?é?µä»¶ã??\n"
+"\n"
+"è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å?è¨å®?ã??"
+
+#: ../mail/em-account-editor.c:2502
 msgid "Check for _new messages every"
 msgstr "è?ªå??æª¢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2224
+#: ../mail/em-account-editor.c:2510
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2420
-#: ../mail/mail-config.glade.h:138
-msgid "Sending Email"
-msgstr "å?³é??é?»å?é?µä»¶"
-
-#: ../mail/em-account-editor.c:2479
-#: ../mail/mail-config.glade.h:73
+#: ../mail/em-account-editor.c:2756 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "é ?è¨å?¼"
 
-#. Security settings
-#: ../mail/em-account-editor.c:2545
-#: ../mail/mail-config.glade.h:133
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../mail/em-account-editor.c:2818 ../mail/mail-config.ui.h:100
 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:2582
-#: ../mail/em-account-editor.c:2677
+#: ../mail/em-account-editor.c:2855 ../mail/em-account-editor.c:2923
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é?¸é ?"
 
-#: ../mail/em-account-editor.c:2583
-#: ../mail/em-account-editor.c:2678
+#: ../mail/em-account-editor.c:2856 ../mail/em-account-editor.c:2924
 msgid "Checking for New Messages"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
-#: ../mail/em-account-editor.c:3145
-#: ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3391
 msgid "Account Editor"
 msgstr "å¸³è??ç·¨è¼¯å?¨"
 
-#: ../mail/em-account-editor.c:3145
-#: ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3391
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸³è??å?©ç??"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:426
-msgid "[Default]"
-msgstr "[é ?è¨å?¼]"
-
-#: ../mail/em-account-prefs.c:483
-msgid "Account name"
-msgstr "å¸³è??å??ç¨±"
-
-#: ../mail/em-account-prefs.c:485
-msgid "Protocol"
-msgstr "é??è¨?å??å®?"
-
-#: ../mail/em-composer-prefs.c:318
-#: ../mail/em-composer-prefs.c:452
-#: ../mail/mail-config.c:1160
-#: ../mail/mail-signature-editor.c:481
-msgid "Unnamed"
-msgstr "æ?ªå?½å??ç??"
-
-#: ../mail/em-composer-prefs.c:961
-msgid "Language(s)"
-msgstr "èª?è¨?"
-
-#: ../mail/em-composer-prefs.c:994
-msgid "Add signature script"
-msgstr "æ?°å¢?ç°½å??ç¨?åº?æª?"
-
-#: ../mail/em-composer-prefs.c:1036
-msgid "Signature(s)"
-msgstr "ç°½å??æª?"
-
-#: ../mail/em-composer-utils.c:1132
-#: ../mail/em-format-quote.c:415
-msgid "-------- Forwarded Message --------"
-msgstr "-------- è½?é??ç??é?µä»¶ --------"
-
-#: ../mail/em-composer-utils.c:1585
-msgid "No destination address provided, forward of the message has been cancelled."
-msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
-
-#: ../mail/em-composer-utils.c:1591
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??å¸³è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
-
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:1953
 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:2105
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} ${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
+#: ../mail/em-composer-utils.c:2000
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} "
+"${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2144
 msgid "-----Original Message-----"
 msgstr "-----å??å§?é?µä»¶-----"
 
-#: ../mail/em-filter-editor.c:172
-msgid "_Filter Rules"
-msgstr "é??æ¿¾å?¨è¦?å??(_F)"
+#: ../mail/em-composer-utils.c:2325
+msgid "Posting destination"
+msgstr "å¼µè²¼ç??ç?®ç??ç«¯"
+
+#: ../mail/em-composer-utils.c:2326
+msgid "Choose folders to post the message to."
+msgstr "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
+
+#: ../mail/em-filter-folder-element.c:258
+msgid "Select Folder"
+msgstr "é?¸æ??è³?æ??å¤¾"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -10702,10 +10122,6 @@ msgstr "å?¶è?²"
 msgid "Completed On"
 msgstr "å·²å®?æ??æ?¼"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "è¤?è£½è?³è³?æ??å¤¾"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "æ?¶ä»¶æ?¥æ??"
@@ -10714,16 +10130,6 @@ msgstr "æ?¶ä»¶æ?¥æ??"
 msgid "Date sent"
 msgstr "é??ä»¶æ?¥æ??"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:765
-#: ../ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "å?ªé?¤"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "å·²å?ªé?¤"
@@ -10772,11 +10178,6 @@ msgstr "è·?é?¨"
 msgid "Forward to"
 msgstr "è½?å¯?è?³"
 
-#: ../mail/em-filter-i18n.h:30
-#: ../mail/em-migrate.c:958
-msgid "Important"
-msgstr "é??è¦?"
-
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "æ?¯ä¹?å¾?ç??"
@@ -10801,9 +10202,7 @@ msgstr "æ?ªè¨å®?"
 msgid "is set"
 msgstr "è¨å®?"
 
-#: ../mail/em-filter-i18n.h:41
-#: ../mail/mail-config.glade.h:102
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
@@ -10843,10 +10242,6 @@ msgstr "é??å??å?¾é?µä»¶"
 msgid "Message Location"
 msgstr "é?µä»¶ä½?ç½®"
 
-#: ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "ç§»è?³è³?æ??å¤¾"
-
 #: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "å»ºç«?ç¨?å¼?ç®¡é??"
@@ -10855,14 +10250,12 @@ msgstr "å»ºç«?ç¨?å¼?ç®¡é??"
 msgid "Play Sound"
 msgstr "æ?æ?¾é?³æ??"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54
-#: ../mail/message-tag-followup.c:61
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "å·²è®?"
 
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "æ?¶ä»¶è??"
 
@@ -10890,13 +10283,11 @@ msgstr "å?³å??å°?æ?¼"
 msgid "Run Program"
 msgstr "å?·è¡?ç¨?å¼?"
 
-#: ../mail/em-filter-i18n.h:62
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "å??æ?¸"
 
-#: ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "å¯?ä»¶è??"
 
@@ -10936,78 +10327,19 @@ msgstr "ä»¥æ¤é??å§?"
 msgid "Stop Processing"
 msgstr "å??æ¢è??ç??"
 
-#: ../mail/em-filter-i18n.h:74
-#: ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:928
-#: ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:300
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1112
-msgid "Subject"
-msgstr "ä¸»æ?¨"
-
 #: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "å??æ¶?è¨å®?ç??æ??"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:530
 msgid "Then"
 msgstr "æ?¥è??ä¾?"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:561
 msgid "Add Ac_tion"
 msgstr "å? å?¥å??ä½?(_T)"
 
-#: ../mail/em-folder-browser.c:194
-msgid "C_reate Search Folder From Search..."
-msgstr "å¾?æ??å°?å»ºç«?æ??å°?è³?æ??å¤¾(_R)..."
-
-#: ../mail/em-folder-browser.c:219
-msgid "All Messages"
-msgstr "æ??æ??é?µä»¶"
-
-#: ../mail/em-folder-browser.c:220
-msgid "Unread Messages"
-msgstr "æ?ªè®?é?µä»¶"
-
-#: ../mail/em-folder-browser.c:222
-msgid "No Label"
-msgstr "ç?¡æ¨?ç±¤"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Read Messages"
-msgstr "å·²è®?é?µä»¶"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Recent Messages"
-msgstr "æ??è¿?ç??é?µä»¶"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Last 5 Days' Messages"
-msgstr "æ??è¿? 5 å¤©ç??é?µä»¶"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Messages with Attachments"
-msgstr "æ??é??å? æª?æ¡?ç??é?µä»¶"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Important Messages"
-msgstr "é??è¦?é?µä»¶"
-
-#: ../mail/em-folder-browser.c:234
-msgid "Messages Not Junk"
-msgstr "é??å??å?¾é?µä»¶"
-
-#: ../mail/em-folder-browser.c:1194
-msgid "Account Search"
-msgstr "å¸³è??æ??å°?"
-
-#: ../mail/em-folder-browser.c:1256
-msgid "All Account Search"
-msgstr "æ??æ??ç??å¸³è??æ??å°?"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -11033,74 +10365,47 @@ msgstr "é??é¡?ä½¿ç?¨é?? (%s):"
 msgid "Quota usage"
 msgstr "é??å?¶ç?¨é??"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359
-#: ../mail/em-folder-tree-model.c:517
-#: ../mail/em-folder-tree.c:2602
-#: ../mail/mail-component.c:168
-#: ../mail/mail-component.c:608
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "æ?¶ä»¶å?£"
-
-#: ../mail/em-folder-properties.c:390
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../mail/em-folder-properties.c:399
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "è³?æ??å¤¾å?§å®¹"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<æ??é??è£?é?¸æ??è³?æ??å¤¾>"
 
-#: ../mail/em-folder-selector.c:249
+#: ../mail/em-folder-selector.c:266
 msgid "C_reate"
 msgstr "å»ºç«?(_R)"
 
-#: ../mail/em-folder-selector.c:253
+#: ../mail/em-folder-selector.c:270
 msgid "Folder _name:"
 msgstr "è³?æ??å¤¾å??ç¨±(_N):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:195
-#: ../mail/em-folder-tree-model.c:197
-#: ../mail/mail-vfolder.c:960
-#: ../mail/mail-vfolder.c:1028
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "æ??å°?è³?æ??å¤¾"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:201
-#: ../mail/em-folder-tree-model.c:203
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
 msgid "UNMATCHED"
 msgstr "ä¸?ç¬¦å??"
 
-#: ../mail/em-folder-tree-model.c:510
-#: ../mail/mail-component.c:169
-msgid "Drafts"
-msgstr "è??ç¨¿"
-
-#: ../mail/em-folder-tree-model.c:513
-#: ../mail/mail-component.c:172
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "ç¯?æ?¬"
-
-#: ../mail/em-folder-tree-model.c:520
-#: ../mail/mail-component.c:170
-msgid "Outbox"
-msgstr "å¯?ä»¶å?£"
-
-#: ../mail/em-folder-tree-model.c:522
-#: ../mail/mail-component.c:171
-msgid "Sent"
-msgstr "å·²å?³é??"
-
-#: ../mail/em-folder-tree-model.c:580
-#: ../mail/em-folder-tree-model.c:889
+#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
 msgid "Loading..."
 msgstr "è¼?å?¥ä¸..."
 
+#: ../mail/em-folder-tree.c:188
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??å¤¾"
+
+#: ../mail/em-folder-tree.c:589
+msgid "Folder names cannot contain '/'"
+msgstr "è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«æ??ç·?ã??"
+
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. The first "%s" will be
 #. * replaced by the folder's name and "%u" will be replaced
@@ -11115,1585 +10420,1315 @@ msgstr "è¼?å?¥ä¸..."
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:318
+#: ../mail/em-folder-tree.c:1071
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:727
+#: ../mail/em-folder-tree.c:1277
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??å¤¾æ¨¹"
 
-#: ../mail/em-folder-tree.c:886
+#: ../mail/em-folder-tree.c:1477
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ£å?¨ç§»å??è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:1479
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ£å?¨è¤?è£½è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:895
-#: ../mail/message-list.c:2018
+#: ../mail/em-folder-tree.c:1486 ../mail/message-list.c:2103
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ£å?¨å°?é?µä»¶ç§»è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:897
-#: ../mail/message-list.c:2020
+#: ../mail/em-folder-tree.c:1488 ../mail/message-list.c:2105
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ£å?¨è¤?è£½é?µä»¶è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:912
+#: ../mail/em-folder-tree.c:1503
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?å±¤ç??å?²å?å??"
 
-#: ../mail/em-folder-tree.c:989
-#: ../ui/evolution-mail-message.xml.h:100
-msgid "_Copy to Folder"
-msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)"
-
-#: ../mail/em-folder-tree.c:990
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Move to Folder"
-msgstr "ç§»è?³è³?æ??å¤¾(_M)"
-
-#: ../mail/em-folder-tree.c:992
-#: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186
-#: ../mail/message-list.c:2110
-msgid "_Move"
-msgstr "ç§»å??(_M)"
-
-#: ../mail/em-folder-tree.c:994
-#: ../mail/message-list.c:2112
-msgid "Cancel _Drag"
-msgstr "å??æ¶?æ??æ??(_D)"
-
-#: ../mail/em-folder-tree.c:1702
-#: ../mail/mail-ops.c:1063
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??å¤¾"
-
-#: ../mail/em-folder-tree.c:2107
-msgid "Open in _New Window"
-msgstr "å?¨æ?°è¦?çª?é??å??(_N)"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2112
-msgid "_New Folder..."
-msgstr "æ?°å¢?è³?æ??å¤¾(_N)..."
-
-#: ../mail/em-folder-tree.c:2115
-msgid "_Move..."
-msgstr "ç§»å??(_M)..."
-
-#: ../mail/em-folder-tree.c:2123
-#: ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "é??æ?°æ?´ç??(_F)"
-
-#: ../mail/em-folder-tree.c:2124
-msgid "Fl_ush Outbox"
-msgstr "æ¸?ç??å¯?ä»¶å?£(_U)"
-
-#: ../mail/em-folder-tree.c:2129
-#: ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "æ¸?ç??å??æ?¶ç?(_E)"
-
-#: ../mail/em-folder-tree.c:2232
-msgid "_Unread Search Folder"
-msgstr "æ?ªè®?æ??å°?è³?æ??å¤¾(_U)"
-
-#: ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-utils.c:98
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "å°?ã??%sã??è¤?è£½å?°ã??%sã??"
 
-#: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
-msgid "Select folder"
-msgstr "é?¸æ??è³?æ??å¤¾"
+#: ../mail/em-folder-utils.c:383
+msgid "Move Folder To"
+msgstr "ç§»å??è³?æ??å¤¾å?°"
 
-#: ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1201
-msgid "C_opy"
-msgstr "è¤?è£½(_O)"
+#: ../mail/em-folder-utils.c:383
+msgid "Copy Folder To"
+msgstr "è¤?è£½è³?æ??å¤¾å?°"
 
-#: ../mail/em-folder-utils.c:537
-#: ../plugins/groupwise-features/share-folder-common.c:144
+#: ../mail/em-folder-utils.c:496
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "æ£å?¨å»ºç«?è³?æ??å¤¾ `%s'"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:659
+msgid "Create Folder"
 msgstr "å»ºç«?è³?æ??å¤¾"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:660
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?å»ºç«?è³?æ??å¤¾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-folder-view.c:1089
-#: ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "å?ªé?¤é?µä»¶å¤±æ??"
-
-#: ../mail/em-folder-view.c:1090
-#: ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "æ?¨æ²?æ??è¶³å¤ ç??æ¬?é??å?ªé?¤æ¤å°?é?µä»¶ã??"
-
-#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335
-#: ../ui/evolution-mail-message.xml.h:102
-msgid "_Edit as New Message..."
-msgstr "ç·¨è¼¯ç?ºæ?°é?µä»¶(_E)..."
-
-#: ../mail/em-folder-view.c:1341
-msgid "U_ndelete"
-msgstr "å¾©å??(_N)"
-
-#: ../mail/em-folder-view.c:1342
-msgid "_Move to Folder..."
-msgstr "ç§»è?³è³?æ??å¤¾(_M)..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "_Copy to Folder..."
-msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)..."
-
-#: ../mail/em-folder-view.c:1346
-msgid "Mar_k as Read"
-msgstr "æ¨?ç¤ºæ??å·²é?±è®?(_K)"
-
-#: ../mail/em-folder-view.c:1347
-msgid "Mark as _Unread"
-msgstr "æ¨?ç¤ºæ??æ?ªé?±è®?(_U)"
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mark as _Important"
-msgstr "æ¨?ç¤ºæ??é??è¦?(_I)"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as Un_important"
-msgstr "æ¨?ç¤ºæ??ä¸?é??è¦?(_I)"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as _Junk"
-msgstr "æ¨?ç¤ºæ??å??å?¾é?µä»¶(_J)"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as _Not Junk"
-msgstr "æ¨?ç¤ºæ??é??å??å?¾é?µä»¶(_N)"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark for Follo_w Up..."
-msgstr "æ¨?ç¤ºç?ºè·?é?¨(_W)..."
-
-#: ../mail/em-folder-view.c:1354
-msgid "_Label"
-msgstr "æ¨?ç±¤(_L)"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1355
-#: ../widgets/misc/e-dateedit.c:469
-msgid "_None"
-msgstr "æ²?æ??(_N)"
-
-#: ../mail/em-folder-view.c:1358
-msgid "_New Label"
-msgstr "æ?°å¢?æ¨?ç±¤(_N)"
-
-#: ../mail/em-folder-view.c:1362
-msgid "Fla_g Completed"
-msgstr "æ¨?å¹?å·²å®?æ??(_G)"
-
-#: ../mail/em-folder-view.c:1363
-msgid "Cl_ear Flag"
-msgstr "æ¸?é?¤æ¨?å¹?(_E)"
-
-#: ../mail/em-folder-view.c:1366
-msgid "Crea_te Rule From Message"
-msgstr "å¾?é?µä»¶å»ºç«?è¦?å??(_T)"
-
-#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
-msgid "Search Folder based on _Subject"
-msgstr "å¾?ä¸»æ?¨å»ºç«?æ??å°?è³?æ??å¤¾(_S)"
-
-#: ../mail/em-folder-view.c:1369
-msgid "Search Folder based on Se_nder"
-msgstr "å¾?å¯?ä»¶è??å»ºç«?æ??å°?è³?æ??å¤¾(_N)"
-
-#: ../mail/em-folder-view.c:1370
-msgid "Search Folder based on _Recipients"
-msgstr "å¾?æ?¶ä»¶è??å»ºç«?æ??å°?è³?æ??å¤¾(_R)"
-
-#: ../mail/em-folder-view.c:1371
-msgid "Search Folder based on Mailing _List"
-msgstr "å¾?é?µä»¶æ¸?å?®å»ºç«?æ??å°?è³?æ??å¤¾(_L)"
-
-#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
-msgid "Filter based on Sub_ject"
-msgstr "å¾?ä¸»æ?¨å»ºç«?é??æ¿¾å?¨(_J)"
-
-#: ../mail/em-folder-view.c:1377
-msgid "Filter based on Sen_der"
-msgstr "å¾?å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨(_D)"
-
-#: ../mail/em-folder-view.c:1378
-msgid "Filter based on Re_cipients"
-msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_C)"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on _Mailing List"
-msgstr "å¾?é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨(_M)"
-
-#. default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2232
-#: ../mail/em-folder-view.c:2275
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:613
-#: ../plugins/google-account-setup/google-source.c:784
-msgid "Default"
-msgstr "é ?è¨å?¼"
-
-#: ../mail/em-folder-view.c:2493
-msgid "Unable to retrieve message"
-msgstr "ç?¡æ³?æ?¥æ?¶é?µä»¶"
-
-#: ../mail/em-folder-view.c:2696
-msgid "Create _Search Folder"
-msgstr "å»ºç«?æ??å°?è³?æ??å¤¾(_S)"
-
-#: ../mail/em-folder-view.c:2697
-msgid "_From this Address"
-msgstr "å¾?é??å??ä½?å??(_F)"
-
-#: ../mail/em-folder-view.c:2698
-msgid "_To this Address"
-msgstr "å?°é??å??ä½?å??(_T)"
-
-#: ../mail/em-folder-view.c:3191
-#, c-format
-msgid "Click to mail %s"
-msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
-
-#: ../mail/em-folder-view.c:3203
+#: ../mail/em-folder-utils.c:676
 #, c-format
-msgid "Click to call %s"
-msgstr "æ??ä¸?ä¸?æ?è??çµ¦ %s"
-
-#: ../mail/em-folder-view.c:3208
-msgid "Click to hide/unhide addresses"
-msgstr "æ??é??è£¡é?±è??/è§£é?¤é?±è??ä½?å??"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾ ã??%sã??"
 
-#: ../mail/em-format-html-display.c:560
-#: ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
 msgid "Unsigned"
 msgstr "æ?ªç°½å??"
 
-#: ../mail/em-format-html-display.c:560
-msgid "This message is not signed. There is no guarantee that this message is authentic."
+#: ../mail/em-format-html-display.c:103
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr "æ¤é?µä»¶æ?ªç°½å??ã??ä¸?ä¿?è?æ¤é?µä»¶å·²é©?è?ã??"
 
-#: ../mail/em-format-html-display.c:561
-#: ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
 msgid "Valid signature"
 msgstr "æ??æ??ç??ç°½å??"
 
-#: ../mail/em-format-html-display.c:561
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+#: ../mail/em-format-html-display.c:104
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr "æ¤é?µä»¶å·²ç°½å??è??ä¸?æ??æ??ï¼?è¡¨ç¤ºå®?é??å¸¸æ??å?¯è?½æ?¯é©?è?ç??é?µä»¶ã??"
 
-#: ../mail/em-format-html-display.c:562
-#: ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
 msgid "Invalid signature"
 msgstr "ç?¡æ??ç??ç°½å??"
 
-#: ../mail/em-format-html-display.c:562
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
+#: ../mail/em-format-html-display.c:105
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr "é?µä»¶ç??ç°½å??ç?¡æ³?æª¢é©?ï¼?å?¯è?½å·²å?¨å?³é??æ??è¢«æ?´å??äº?ã??"
 
-#: ../mail/em-format-html-display.c:563
-#: ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç°½å??æ??æ??ï¼?ä½?æ?¯ç?¡æ³?æª¢é©?å¯?ä»¶è??"
 
-#: ../mail/em-format-html-display.c:563
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+#: ../mail/em-format-html-display.c:106
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr "æ¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½å??ï¼?ä½?æ?¯é?µä»¶ç??å¯?ä»¶è??ç?¡æ³?æª¢é©?ã??"
 
-#: ../mail/em-format-html-display.c:564
-#: ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
 msgid "Signature exists, but need public key"
 msgstr "ç°½ç« å?å?¨ï¼?ä½?é??è¦?å?¬é??é??é?°"
 
-#: ../mail/em-format-html-display.c:564
-msgid "This message is signed with a signature, but there is no corresponding public key."
+#: ../mail/em-format-html-display.c:107
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
 msgstr "æ¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½å??ï¼?ä½?æ?¯æ²?æ??å°?æ??ç??å?¬é??é??é?°ã??"
 
-#: ../mail/em-format-html-display.c:571
-#: ../mail/em-format-html.c:664
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
 msgid "Unencrypted"
 msgstr "æ?ªå? å¯?"
 
-#: ../mail/em-format-html-display.c:571
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+#: ../mail/em-format-html-display.c:114
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
 msgstr "æ¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??ç¶²é??ç¶²è·¯å?³é??å?¯è?½æ??è¢«æª¢é?±ã??"
 
-#: ../mail/em-format-html-display.c:572
-#: ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
 msgid "Encrypted, weak"
 msgstr "å·²å? å¯?ï¼?ä¸?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:572
-msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr "æ¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??äººå¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??æ?¥ï¼?ä¸¦ä¸?æ?¯ç?¡æ³?æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
+#: ../mail/em-format-html-display.c:115
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"æ¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??äººå¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??"
+"æ?¥ï¼?ä¸¦ä¸?æ?¯ç?¡æ³?æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:573
-#: ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
 msgid "Encrypted"
 msgstr "å·²å? å¯?"
 
-#: ../mail/em-format-html-display.c:573
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+#: ../mail/em-format-html-display.c:116
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr "æ¤é?µä»¶å·²å? å¯?ã??å¤?é?¢ç??äººé?£ä»¥æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:574
-#: ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
 msgid "Encrypted, strong"
 msgstr "å·²å? å¯?ï¼?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:574
-msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr "æ¤é?µä»¶å·²å? å¯?ï¼?ä½¿ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??ç¸±ä½¿ç¶?é??ä¸?æ®µæ??é??ï¼?å¤?é?¢ç??äººå¾?é?£æª¢é?±æ¤é?µä»¶ç??å?§å®¹ã??"
+#: ../mail/em-format-html-display.c:117
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"æ¤é?µä»¶å·²å? å¯?ï¼?ä½¿ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??ç¸±ä½¿ç¶?é??ä¸?æ®µæ??é??ï¼?å¤?é?¢ç??äººå¾?é?£æª¢é?±æ¤é?µä»¶"
+"ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:675
-#: ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æª¢è¦?æ??è?(_V)"
 
-#: ../mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "æ¤æ??è?ç?¡æ³?æª¢è¦?"
 
-#: ../mail/em-format-html-display.c:980
+#: ../mail/em-format-html-display.c:509
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution ç?¡æ³?é¡¯ç¤ºæ¤å°?é?»å?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??ç??å¤§å°?ã??æ?¨å?¯ä»¥ç?¨ä¸?æ??ç??ç??æ?¹"
+"å¼?æ??ä½¿ç?¨å¤?é?¨æ??å?ç·¨è¼¯å?¨ä¾?é?±è®?å®?ã??"
+
+#: ../mail/em-format-html-display.c:738
 msgid "Completed on"
 msgstr "å·²å®?æ??æ?¼"
 
-#: ../mail/em-format-html-display.c:988
+#: ../mail/em-format-html-display.c:746
 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:992
+#: ../mail/em-format-html-display.c:750
 msgid "by"
 msgstr "æ?¼"
 
-#: ../mail/em-format-html-display.c:1071
-#: ../widgets/misc/e-attachment-view.c:357
-msgid "_View Inline"
-msgstr "æª¢è¦?è¡?å?§(_V)"
-
-#: ../mail/em-format-html-display.c:1072
-#: ../widgets/misc/e-attachment-view.c:350
-msgid "_Hide"
-msgstr "é?±è??(_H)"
-
-#: ../mail/em-format-html-display.c:1073
-msgid "_Fit to Width"
-msgstr "ç¬¦å??å¯¬åº¦(_F)"
-
-#: ../mail/em-format-html-display.c:1074
-msgid "Show _Original Size"
-msgstr "é¡¯ç¤ºå??å§?å¤§å°?(_O)"
-
-#: ../mail/em-format-html-display.c:1575
-#: ../mail/em-format-html-display.c:1614
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html-display.c:997
 msgid "View _Unformatted"
 msgstr "æª¢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1577
+#: ../mail/em-format-html-display.c:960
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1634
+#: ../mail/em-format-html-display.c:1017
 msgid "O_pen With"
 msgstr "ä»¥...é??å??(_O)"
 
-#: ../mail/em-format-html-display.c:1711
-msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
-msgstr "Evolution ç?¡æ³?é¡¯ç¤ºæ¤å°?é?»å?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??ç??å¤§å°?ã??æ?¨å?¯ä»¥ç?¨ä¸?æ??ç??ç??æ?¹å¼?æ??ä½¿ç?¨å¤?é?¨æ??å?ç·¨è¼¯å?¨ä¾?é?±è®?å®?ã??"
-
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "ç¬¬ %d / %d é ?"
 
-#: ../mail/em-format-html.c:505
-#: ../mail/em-format-html.c:514
+#: ../mail/em-format-html.c:165
+msgid "Formatting message"
+msgstr "æ ¼å¼?å??é?µä»¶"
+
+#: ../mail/em-format-html.c:356
+msgid "Formatting Message..."
+msgstr "æ ¼å¼?å??é?µä»¶..."
+
+#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "æ£å?¨æ?·å?? `%s'"
 
-#: ../mail/em-format-html.c:929
+#: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:937
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:1892
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:978
+#: ../mail/em-format-html.c:1903
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??ç¤º"
 
-#: ../mail/em-format-html.c:980
+#: ../mail/em-format-html.c:1905
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:1001
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:1012
+#: ../mail/em-format-html.c:1937
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ä¸?æ??ç??å¤?é?¨æª?æ¡?æ??ç¤º (ã??%sã??é¡?å??)"
 
-#: ../mail/em-format-html.c:1240
-msgid "Formatting message"
-msgstr "æ ¼å¼?å??é?µä»¶"
-
-#: ../mail/em-format-html.c:1414
-msgid "Formatting Message..."
-msgstr "æ ¼å¼?å??é?µä»¶..."
-
-#: ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1631
-#: ../mail/em-format-html.c:1652
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:926
-#: ../mail/em-mailer-prefs.c:79
-msgid "Cc"
-msgstr "å?¯æ?¬"
-
-#: ../mail/em-format-html.c:1568
-#: ../mail/em-format-html.c:1637
-#: ../mail/em-format-html.c:1655
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:927
-#: ../mail/em-mailer-prefs.c:80
-msgid "Bcc"
-msgstr "å¯?ä»¶å?¯æ?¬"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1747
-#: ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1435
-msgid "Mailer"
-msgstr "å¯?ä»¶è??"
-
 #. 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:1910
+#: ../mail/em-format-html.c:2595
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "é??å°?é?µä»¶æ?¯ç?± <b>%s</b> ä»£è¡¨ <b>%s</b> å¯?å?º"
 
-#: ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:924
-#: ../mail/em-mailer-prefs.c:77
-msgid "Reply-To"
-msgstr "å??è¦?"
-
-#: ../mail/em-format.c:929
-#: ../mail/em-mailer-prefs.c:82
-#: ../mail/message-list.etspec.h:2
-#: ../widgets/misc/e-dateedit.c:316
-#: ../widgets/misc/e-dateedit.c:338
-msgid "Date"
-msgstr "æ?¥æ??"
-
-#: ../mail/em-format.c:930
-#: ../mail/em-mailer-prefs.c:83
-msgid "Newsgroups"
-msgstr "æ?°è??ç¾¤çµ?"
-
-#: ../mail/em-format.c:931
-#: ../mail/em-mailer-prefs.c:84
-#: ../plugins/face/org-gnome-face.eplug.xml.h:4
-msgid "Face"
-msgstr "é?¢è²?"
-
-#: ../mail/em-format.c:1201
-#, c-format
-msgid "%s attachment"
-msgstr "%s é??å? æª?æ¡?"
-
-#: ../mail/em-format.c:1239
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
-
-#: ../mail/em-format.c:1376
-#: ../mail/em-format.c:1533
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "ç?¡æ³?è§£æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
-
-#: ../mail/em-format.c:1384
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message"
-msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-#: ../mail/em-format.c:1552
-msgid "Unsupported signature format"
-msgstr "ä¸?æ?¯æ?´ç??ç°½å??æ ¼å¼?"
-
-#: ../mail/em-format.c:1560
-#: ../mail/em-format.c:1698
-msgid "Error verifying signature"
-msgstr "æª¢é©?ç°½å??ç?¼ç??é?¯èª¤"
-
-#: ../mail/em-format.c:1560
-#: ../mail/em-format.c:1689
-#: ../mail/em-format.c:1698
-msgid "Unknown error verifying signature"
-msgstr "æª¢é©?ç°½å??ç?¼ç??ä¸?æ??é?¯èª¤"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message"
-msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message: Unknown error"
-msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Every time"
-msgstr "æ¯?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per day"
-msgstr "æ¯?å¤©ä¸?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per week"
-msgstr "æ¯?é?±ä¸?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:98
-msgid "Once per month"
-msgstr "æ¯?æ??ä¸?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:332
-msgid "Add Custom Junk Header"
-msgstr "å? å?¥è?ªè¨?å??å?¾é?µä»¶æª?é "
-
-#: ../mail/em-mailer-prefs.c:336
-msgid "Header Name:"
-msgstr "æ¨?é å??ç¨±:"
-
-#: ../mail/em-mailer-prefs.c:337
-msgid "Header Value Contains:"
-msgstr "æ¨?é æ?¸å?¼å??å?«:"
-
-#: ../mail/em-mailer-prefs.c:438
-#: ../widgets/table/e-table-click-to-add.c:500
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "é ?é¦?"
-
-#: ../mail/em-mailer-prefs.c:442
-msgid "Contains Value"
-msgstr "å??å?«æ?¸å?¼"
-
-#: ../mail/em-mailer-prefs.c:465
-msgid "Color"
-msgstr "é¡?è?²"
-
-#: ../mail/em-mailer-prefs.c:468
-msgid "Tag"
-msgstr "æ¨?ç±¤"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1063
-#: ../mail/em-mailer-prefs.c:1117
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s å¤?æ??ç¨?å¼?å·²å?¯ä½¿ç?¨ä¸¦ä¸?è©²è»?é«?ä¹?å®?è£?å®?æ??ã??"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1071
-#: ../mail/em-mailer-prefs.c:1126
-#, c-format
-msgid "%s plugin is not available. Please check whether the package is installed."
-msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?ä½¿ç?¨ã??è«?æª¢æ?¥æ?¯å?¦æ??å®?è£?è©²å¥?ä»¶ã??"
-
-#: ../mail/em-mailer-prefs.c:1092
-msgid "No Junk plugin available"
-msgstr "æ²?æ??å?¯ç?¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?"
-
-#: ../mail/em-mailer-prefs.c:1455
-msgid "Date header:"
-msgstr "æ?¥æ??æ¨?é ï¼?"
-
-#. green
-#: ../mail/em-migrate.c:961
-msgid "To Do"
-msgstr "å¾?è¾¦"
-
-#. blue
-#: ../mail/em-migrate.c:962
-msgid "Later"
-msgstr "ç¨?å¾?"
-
-#: ../mail/em-migrate.c:1128
-msgid "Migration"
-msgstr "ç§»è½?"
-
-#: ../mail/em-migrate.c:1573
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "ç?¡æ³?å»ºç«?æ?°è³?æ??å¤¾ `%s'ï¼?%s"
-
-#: ../mail/em-migrate.c:1599
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "ç?¡æ³?è¤?è£½è£½è³?æ??å¤¾ `%s' è?³ `%s'ï¼?%s"
-
-#: ../mail/em-migrate.c:1784
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
-
-#: ../mail/em-migrate.c:1789
-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 ""
-"Evolution ä¿¡ç®±è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../mail/em-migrate.c:1990
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
-
-#: ../mail/em-migrate.c:2004
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "ç?¡æ³?å»ºç«? POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
-
-#: ../mail/em-migrate.c:2033
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "ç?¡æ³?è¤?è£½ POP å?²å?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
-
-#: ../mail/em-migrate.c:2504
-#: ../mail/em-migrate.c:2516
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "ç?¡æ³?å»ºç«?æ?¬å?°é?µä»¶å?²å?å?? `%s':%s"
-
-#: ../mail/em-migrate.c:2874
-msgid "Migrating Folders"
-msgstr "æ£å?¨è½?ç§»è³?æ??å¤¾"
-
-#: ../mail/em-migrate.c:2874
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ä¿¡ç®±è³?æ??å¤¾ç??æ??è¦?æ ¼å¼?å¾? Evolution 2.24 å¾?è½?æ??ç?º SQLiteã??\n"
-"\n"
-"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
-
-#: ../mail/em-migrate.c:2955
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "ç?¡æ³?å?¨ `%s' å»ºç«?æ?¬å?°é?µä»¶è³?æ??å¤¾:%s"
-
-#: ../mail/em-migrate.c:2974
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
-msgstr "ç?¡æ³?å¾?ä»¥å??ç?? Evolution è®?å??è¨å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å?å?¨æ??æ??æ¯?ã??"
-
-#: ../mail/em-popup.c:364
-msgid "Save As..."
-msgstr "å?¦å?æ?°æª?..."
-
-#: ../mail/em-popup.c:389
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../mail/em-popup.c:495
-#: ../widgets/misc/e-attachment-handler-image.c:147
-msgid "Set as _Background"
-msgstr "è¨ç?ºè??æ?¯(_B)"
-
-#: ../mail/em-popup.c:497
-msgid "_Reply to sender"
-msgstr "å??è¦?å¯?ä»¶è??(_R)"
-
-#: ../mail/em-popup.c:498
-#: ../ui/evolution-mail-message.xml.h:79
-msgid "Reply to _List"
-msgstr "å??è¦?è?³æ¸?å?®(_L)"
-
-#. make it first item
-#: ../mail/em-popup.c:547
-#: ../mail/em-popup.c:746
-msgid "_Add to Address Book"
-msgstr "å? å?¥å?°é??è¨?é??(_A)"
-
-#: ../mail/em-popup.c:725
-#, c-format
-msgid "Open in %s..."
-msgstr "å?¨ %s å?§é??å??..."
-
-#: ../mail/em-subscribe-editor.c:606
+#: ../mail/em-subscribe-editor.c:586
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "æ¤å?²å?å??ä¸?æ?¯æ?´è¨?é?±ï¼?æ??è??æ?ªå??ç?¨å®?å??ã??"
 
-#: ../mail/em-subscribe-editor.c:639
+#: ../mail/em-subscribe-editor.c:619
 msgid "Subscribed"
 msgstr "å·²è¨?é?±"
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:623
 msgid "Folder"
 msgstr "è³?æ??å¤¾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:858
+#: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
 msgstr "è«?é?¸æ??ä¸?å??ä¼ºæ??å?¨ã??"
 
-#: ../mail/em-subscribe-editor.c:894
+#: ../mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "å°?æ?ªé?¸æ??ä¼ºæ??å?¨"
 
-#. Check buttons
-#: ../mail/em-utils.c:121
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
-msgid "_Do not show this message again."
-msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯(_D)"
-
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:311
 msgid "Message Filters"
 msgstr "é?µä»¶è¦?å??"
 
-#: ../mail/em-utils.c:369
-msgid "message"
-msgstr "é?µä»¶"
-
-#: ../mail/em-utils.c:652
-msgid "Save Message..."
-msgstr "å?²å?é?µä»¶â?¦"
-
-#: ../mail/em-utils.c:702
-msgid "Add address"
-msgstr "æ?°å¢?å?°å??"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1223
+#: ../mail/em-utils.c:815
 #, c-format
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
 
-#: ../mail/em-vfolder-editor.c:114
+#: ../mail/em-vfolder-editor.c:124
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??å¤¾(_F)"
 
-#: ../mail/em-vfolder-rule.c:592
-msgid "Search Folder source"
-msgstr "æ??å°?è³?æ??å¤¾ä¾?æº?"
+#: ../mail/em-vfolder-rule.c:522
+msgid "Add Folder"
+msgstr "å? å?¥è³?æ??å¤¾"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Filter Editor\" window height"
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?é«?åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Filter Editor\" window maximize state"
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?æ??å¤§å??ç??æ??"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Filter Editor\" window width"
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?å¯¬åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Search Folder Editor\" window height"
+msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?é«?åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?æ??å¤§å??ç??æ??"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Search Folder Editor\" window width"
+msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?å¯¬åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?æ??å¤§å??ç??æ??"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?å¯¬åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Allows Evolution to display text part of limited size"
 msgstr "å??è¨± evolution é¡¯ç¤ºå?§æ??é?¨ä»½ç??é??å?¶å¤§å°?"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "ä¸?å®?è¦?æ±?è®?ä¿¡å??æ¢?"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "è?ªå??è¡¨æ??è¾¨è?"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "è?ªå??é?£çµ?è¾¨è?"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "æª¢æ?¥å?§é??ç??å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "å¼?ç?¨å??ç?½è?²å½©"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "å¼?ç?¨å??ç?½è?²å½©ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
 msgstr "æ?°å¯«è¦?çª?é ?è¨é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
 msgstr "æ?°å¯«è¦?çª?é ?è¨å¯¬åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "ç·¨è¼¯å?¨è®?å??/é??å? ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "å£?ç¸®å?¨ TO/CC/BCC ä¸ä½?å??ç??é¡¯ç¤ºæ?¹å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
 msgstr "å°? TO/CC/BCC ä¸ä½?å??ç??é¡¯ç¤ºæ?¹å¼?å£?ç¸®ç?º address_count ä¸æ??å®?ç??é?·åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
 msgstr "æ?§å?¶æ?¬å?°ç«¯è®?æ?´è??é? ç«¯é?µä»¶ä¼ºæ??å?¨å??æ¥ç??é »ç??ã??é??é??å¿?é ?è?³å°?æ?? 30 ç§?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr "æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªè¨?æ¨?é ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:19
-msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
-msgstr "æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªè¨?æ¨?é ã??æ¤æ¸?å?®ä¸ç??å??ç´ æ ¼å¼?ç?ºã??headername=valueã??å?ä¸²ã??"
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªè¨?æ¨?é ã??æ¤æ¸?å?®ä¸ç??å??ç´ æ ¼å¼?ç?ºã??headername=valueã??å?ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?è¨å?å??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?è¨å?å??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?è¨å?å??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?è¨å?å??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
 msgstr "é ?è¨è½?é??æ¨£å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?è¨é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "é?µä»¶è¦?çª?ç??é ?è¨é«?åº¦ã??"
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default height of the mail browser window."
+msgstr "é?µä»¶ç??è¦½å?¨è¦?çª?ç??é ?è¨é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "è¨?é?±å°?è©±ç??ç??é ?è¨é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Default maximized state of the mail browser window."
+msgstr "é?µä»¶ç??è¦½å?¨è¦?çª?ç??æ??å¤§å??ç??æ??ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
 msgstr "é ?è¨å??è¦?æ¨£å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
 msgstr "ç?¸é??é?µä»¶å±?é??ç??æ??ç??é ?è¨æ?¸å?¼"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?è¨å¯¬åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "é?µä»¶è¦?çª?ç??é ?è¨å¯¬åº¦ã??"
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid "Default width of the mail browser window."
+msgstr "é?µä»¶ç??è¦½å?¨è¦?çª?ç??é ?è¨å¯¬åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
 msgstr "è¨?é?±å°?è©±ç??ç??é ?è¨å¯¬åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to look up addresses for junk filtering in local address book only"
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
 msgstr "æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸å°?æ?¾æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??é?»å?é?µä»¶ä½?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "æ±ºå®?æ?¯å?¦å?¨é??è¨?é??ä¸å°?æ?¾å¯?ä»¶è??é?»å?é?µä»¶å¸³è??"
 
-#: ../mail/evolution-mail.schemas.in.h:35
-msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
-msgstr "æ±ºå®?æ?¯å?¦å?¨é??è¨?é??ä¸å°?æ?¾å¯?ä»¶è??é?»å?é?µä»¶å¸³è??ã??å¦?æ??æ?¾å¾?å?°ï¼?å°±ä¸?å?¤æ?·ç?ºå??å?¾é?µä»¶ã??å®?æ??æ??å°?æ¨?è¨?ç?ºè?ªå??è£?é½?ç??é??è¨?é??ã??ä½?è?¥æ¨?è¨?ç?ºè?ªå??è£?é½?ç??æ?¯é? ç«¯é??è¨?é??ï¼?å?? LDAPï¼?ï¼?å??é??åº¦å?¯è?½æ??å¾?æ?¢ã??"
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"æ±ºå®?æ?¯å?¦å?¨é??è¨?é??ä¸å°?æ?¾å¯?ä»¶è??é?»å?é?µä»¶å¸³è??ã??å¦?æ??æ?¾å¾?å?°ï¼?å°±ä¸?å?¤æ?·ç?ºå??å?¾é?µä»¶ã??å®?"
+"æ??æ??å°?æ¨?è¨?ç?ºè?ªå??è£?é½?ç??é??è¨?é??ã??ä½?è?¥æ¨?è¨?ç?ºè?ªå??è£?é½?ç??æ?¯é? ç«¯é??è¨?é??ï¼?å?? LDAPï¼?ï¼?å??"
+"é??åº¦å?¯è?½æ??å¾?æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "æ±ºå®?æ?¯å?¦ä½¿ç?¨è?ªè¨?æ¨?é ä¾?æª¢æ?¥å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:37
-msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
-msgstr "æ±ºå®?æ?¯å?¦ä½¿ç?¨è?ªè¨?æ¨?é ä¾?æª¢æ?¥å??å?¾é?µä»¶ã??å¦?æ??å??ç?¨é??å??é?¸é ?ä¸¦ä¸?æ??ä¾?æ¨?é ï¼?å°?æ??æ??å??å??å?¾é?µä»¶æª¢æ?¥ç??é??åº¦ã??"
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+"æ±ºå®?æ?¯å?¦ä½¿ç?¨è?ªè¨?æ¨?é ä¾?æª¢æ?¥å??å?¾é?µä»¶ã??å¦?æ??å??ç?¨é??å??é?¸é ?ä¸¦ä¸?æ??ä¾?æ¨?é ï¼?å°?æ??æ??å??å??"
+"å?¾é?µä»¶æª¢æ?¥ç??é??åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
 msgstr "æ±ºå®?æ?¯å?¦å?¨å??ç?´æª¢è¦?ç??ã??é?µä»¶ã??è£¡ç??ã??å¯?ä»¶äººã??å??ã??ä¸»æ?¨ã??ä¸ä½¿ç?¨å??æ¨£ç??å?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
-msgstr "ç?¨ä¾?é?µä»¶ç·¨è¼¯å?¨è¼?å?¥/é??å? æª?æ¡?ç??ç?®é??ã??"
+msgstr "ç?¨ä¾?é?µä»¶ç·¨è¼¯å?¨è¼?å?¥/é??ä»¶ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "ç?¨ä¾?å?²å?é?µä»¶å??ä»¶æª?ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "å??ç?¨æ??å??ç?¨å?´é??å??ç??è³?æ??å¤¾å??ç¨±ç??ç?¥å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Do not add signature delimiter"
+msgstr "ç?¡æ³?å? å?¥ç°½å??æª?å??é??ç¬¦è??"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ç?¶æ?¨è¼¸å?¥å?§å®¹æ??å?¨æ??å?ä¸?é¡¯ç¤ºæ?¼å?é?¯èª¤æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "é?¢é??æ??æ¸?ç©ºå??å?¾é?µä»¶è³?æ??å¤¾"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "çµ?æ??æ??æ¸?ç©ºå??å?¾è³?æ??å¤¾"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "é?¢é?? Evolution æ??æ¸?ç©ºæ??æ??å??å?¾é?µä»¶è³?æ??å¤¾ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "çµ?æ?? Evolution æ??æ¸?ç©ºæ??æ??å??å?¾è³?æ??å¤¾"
 
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
-msgstr "å??ç?¨ HTML é?µä»¶ä¸ç??å??ç?«å??ç??ã??è¨±å¤?ä½¿ç?¨è??èª?ç?ºå??ç?«å??ç??å¾?ç?©äººï¼?å? è??å??å¥½ä»¥é??æ??å??ç??ä»£æ?¿ã??"
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"å??ç?¨ HTML é?µä»¶ä¸ç??å??ç?«å??ç??ã??è¨±å¤?ä½¿ç?¨è??èª?ç?ºå??ç?«å??ç??å¾?ç?©äººï¼?å? è??å??å¥½ä»¥é??æ??å??ç??"
+"ä»£æ?¿ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "å??ç?¨æ??å?¥è??æ¨¡å¼?ï¼?å¦?æ¤æ?¨å?¯ä»¥å?¨é?±è®?é?µä»¶æ??ç??å?°æ¸¸æ¨?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "å??ç?¨æ??å??ç?¨é?è¡?ç©ºç?½é?µ"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "å??ç?¨æ??å??ç?¨æ¨?è¨?å¤?å??é?µä»¶æ??ç??æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "å??ç?¨æ??å??ç?¨é?¨æ??å?³æ?¥å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "å??ç?¨æ??å°?è³?æ??å¤¾"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "å??ç?¨ç¨?å¼?é??å§?æ??æ??å°?è³?æ??å¤¾ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Enable the side bar search feature to allow interactive searching of folder names."
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr "å??ç?¨å?´é??å??æ??å°?å??è?½å??è¨±äº?å??å¼?æ??å°?è³?æ??å¤¾å??ç¨±ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:55
-msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
 msgstr "å??ç?¨æ¤é?¸é ?å?¯å?¨é?µä»¶é ?è¦½ã??é?µä»¶æ¸?å?®å??è³?æ??å¤¾ä¸ä½¿ç?¨ç©ºç?½é?µæ?²å??ç?«é?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr "å??ç?¨ä»¥é¡¯ç¤ºé??å?¶å¤§å°?ç??é?µä»¶æ??å?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "å??ç?¨/å??ç?¨æ??å?¥è??æ¨¡å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:58
-#: ../mail/mail-config.glade.h:86
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "å°?æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook/GMail å½¢å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:59
-msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
-msgstr "å°?é?µä»¶æ¨?é ä¸ç??æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?å¥½è®?å®?å??è?½æ£ç¢ºé¡¯ç¤ºç?± Evolution å¯?å?ºç?? UTF-8 å?å??æª?æ¡?å??ç¨±ï¼?å? ç?ºå®?å??ä¸¦æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?æ£ç¢ºç?? RFC 2047 æ¨?æº?ã??"
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid ""
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+"å°?é?µä»¶æ¨?é ä¸ç??æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?å¥½è®?å®?å??è?½æ£ç¢ºé¡¯ç¤ºç?± "
+"Evolution å¯?å?ºç?? UTF-8 å?å??æª?æ¡?å??ç¨±ï¼?å? ç?ºå®?å??ä¸¦æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?"
+"æ£ç¢ºç?? RFC 2047 æ¨?æº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é?±è??å??è³?æ??å¤¾é ?è¦½ä¸¦ç§»é?¤é?¸å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:63
-msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+#: ../mail/evolution-mail.schemas.in.h:71
+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:64
-msgid "If the \"Preview\" pane is on, then show it side-by-side rather than vertically."
-msgstr "ç?¶ã??é ?è¦½ã??çª?æ ¼é??å??æ??ï¼?å°?å®?ç·?è²¼é¡¯ç¤ºè??é??é??ç??é¡¯ç¤ºã??"
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+"å¦?æ??æ²?æ??å?§å»ºæª¢è¦?å?¨å?¯ç?¨æ?¼ Evolution è£¡é?¢ç?¹æ®?ç?? MIME é¡?å??ï¼?ä»»ä½?é¡¯ç¤ºå?¨æ¤æ¸?å?®ç??  "
+"MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??åº«ä¹? Bonobo å??ä»¶æª¢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§"
+"å®¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:65
-msgid "If there isn't a builtin viewer for a particular MIME type inside Evolution, any MIME types appearing in this list which map to a Bonobo component viewer in GNOME's MIME type database may be used for displaying content."
-msgstr "å¦?æ??æ²?æ??å?§å»ºæª¢è¦?å?¨å?¯ç?¨æ?¼ Evolution è£¡é?¢ç?¹æ®?ç?? MIME é¡?å??ï¼?ä»»ä½?é¡¯ç¤ºå?¨æ¤æ¸?å?®ç??  MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??åº«ä¹? Bonobo å??ä»¶æª¢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§å®¹ã??"
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?é«?åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?é«?åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:66
-msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?é«?åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??"
+"è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯"
+"å?¨ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
-msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?å¯¬åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§"
+"å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??æ??å°?è³?æ??å¤¾ç·¨"
+"è¼¯å?¨ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:69
-msgid "It disables/enables the repeated prompts to ask if offline sync is required before going into offline mode."
-msgstr "å®?å??ç?¨/å??ç?¨å?¨é?²å?¥é?¢ç·?æ¨¡å¼?å??æ?¯å?¦é??è¤?æ??ç¤ºæ??ç?¡é?¢ç·?å??å??æ¥ç??é??æ±?ã??"
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??"
+"è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µ"
+"ä»¶ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
-msgstr "å®?å??ç?¨/å??ç?¨å?¨å¾?æ??å°?è³?æ??å¤¾ä¸å?ªé?¤é?µä»¶æ??æ?¯å?¦é??è¤?æ??ç¤ºä»¥è¦å??é?£å°?æ??æ°¸ä¹?å?ªé?¤é?µä»¶ï¼?è??é??å??æ?¯å°?é?µä»¶è?ªæ??å°?çµ?æ??ä¸ç§»é?¤ã??"
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?å¯¬åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?å¯¬åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?å¯¬åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+"å®?å??ç?¨/å??ç?¨å?¨å¾?æ??å°?è³?æ??å¤¾ä¸å?ªé?¤é?µä»¶æ??æ?¯å?¦é??è¤?æ??ç¤ºä»¥è¦å??é?£å°?æ??æ°¸ä¹?å?ªé?¤é?µä»¶ï¼?è??"
+"é??å??æ?¯å°?é?µä»¶è?ªæ??å°?çµ?æ??ä¸ç§»é?¤ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??å?¾é?µä»¶ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??æ?¶ç?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Layout style"
+msgstr "é??ç½®æ¨£å¼?"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "æ¨?ç±¤å??ç?¸é??è?²å½©ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME é¡?å??æ¸?å?®ï¼?æª¢æ?¥ Bonobo å??ä»¶æª¢è¦?å?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "æ?¥æ?¶ç??æ??æ¬?æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "å¸³è??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr "Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??å¸³è??æ¸?å?®ã??æ¸?å?®å??å?«è?? /apps/evolution/mail/accounts ç?¸é??ç??å?ä¸²å?½å??å?ç?®é??ã??"
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??å¸³è??æ¸?å?®ã??æ¸?å?®å??å?«è?? /apps/evolution/mail/accounts "
+"ç?¸é??ç??å?ä¸²å?½å??å?ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "è?ªè¨?æª?é ä»¥å??å®?å??æ?¯å?¦å??ç?¨ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ç?¨æ?¼æ?¼å?æª¢æ?¥ç??å?å?¸èª?è¨?ç¢¼æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
-msgstr "Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??æ¨?ç±¤æ¸?å?®ã??æ¸?å?®å??å?«å?ä¸²ï¼?å?¶ä¸å??å?« name:colorï¼?color ä½¿ç?¨ HTML å??å?é?²ä½?ç·¨ç¢¼ã??"
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+"Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??æ¨?ç±¤æ¸?å?®ã??æ¸?å?®å??å?«å?ä¸²ï¼?å?¶ä¸å??å?« name:colorï¼?color "
+"ä½¿ç?¨ HTML å??å?é?²ä½?ç·¨ç¢¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "å·²ç¶?æ?¥å??å?¶æ??æ¬?ç??å??å®?æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "é??é?? HTTP è¼?å?¥ HTML é?µä»¶ç??å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
-msgstr "é??é?? HTTP(S) è¼?å?¥ HTML é?µä»¶ç??å??ç??ã??å?¯è?½ç??å?¼ç?ºï¼?ã??0ã??â?? ä¸?å¾?ç¶²è·¯è¼?å?¥å??ç??ã??ã??1ã??â?? å¦?æ??æ?¯å?¨é?£çµ¡äººè£¡ç??å¯?ä»¶è??æ??ï¼?è¼?å?¥å??ç??ã??ã??2ã??- ä¸?å®?å¾?ç¶²è·¯è¼?å?¥å??ç??ã??"
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid ""
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
+msgstr ""
+"é??é?? HTTP(S) è¼?å?¥ HTML é?µä»¶ç??å??ç??ã??å?¯è?½ç??å?¼ç?ºï¼?ã??0ã??â?? ä¸?å¾?ç¶²è·¯è¼?å?¥å??ç??ã??"
+"ã??1ã??â?? å¦?æ??æ?¯å?¨é?£çµ¡äººè£¡ç??å¯?ä»¶è??æ??ï¼?è¼?å?¥å??ç??ã??ã??2ã??- ä¸?å®?å¾?ç¶²è·¯è¼?å?¥å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "è¨?é??é??æ¿¾å?¨å??ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "å°?é??æ¿¾å?¨å??ä½?è¨?é??å?°æ??å®?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "ç?¨æ?¼è¨?é??é??æ¿¾å?¨å??ä½?ç??è¨?é??æª?æ¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "ç?¨æ?¼è¨?é??é??æ¿¾å?¨å??ä½?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Mail browser height"
+msgstr "é?µä»¶ç??è¦½å?¨é«?åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr "é?µä»¶ç??è¦½å?¨æ??å¤§å??"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Mail browser width"
+msgstr "é?µä»¶ç??è¦½å?¨å¯¬åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?ç¤ºæ??å·²é?±è®?"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?ç¤ºæ??å·²é?±è®?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "å?¨é?µä»¶ã??é ?è¦½ã??ä¸æ¨?ç¤ºå¼?ç?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "å?¨é?µä»¶ã??é ?è¦½ã??ä¸æ¨?ç¤ºå¼?ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default height"
-msgstr "é?µä»¶è¦?çª?é ?è¨é«?åº¦"
-
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Message Window default width"
-msgstr "é?µä»¶è¦?çª?é ?è¨å¯¬åº¦"
-
 # (pofilter) gconf: do not translate gconf attribute: "normal", "source"
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "è¨?æ?¯é¡¯ç¤ºæ¨£å¼? (ã??normalã??[ä¸?è?¬]ã??ã??full headersã??[å®?æ?´æª?é ]ã??ã??sourceã??[ä¾?æº?])"
+msgstr ""
+"è¨?æ?¯é¡¯ç¤ºæ¨£å¼? (ã??normalã??[ä¸?è?¬]ã??ã??full headersã??[å®?æ?´æª?é ]ã??ã??sourceã??[ä¾?æº?])"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr "çµ?æ??æ??æ¸?ç©ºå??å?¾é?µä»¶æ??å°?é??é??å¤©æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
 msgstr "çµ?æ??æ??æ¸?ç©ºå??æ?¶ç?æ??å°?é??é??å¤©æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "çµ?æ??æ??æ¸?ç©ºå??å?¾é?µä»¶æ??å°?é??é??å¤©æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "çµ?æ??æ??æ¸?ç©ºå??æ?¶ç?æ??å°?é??é??å¤©æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "é¡¯ç¤ºæ?¼ TO/CC/BCC ä¸ä½?å??ç??é?·åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "æ²?æ??ä¸»æ?¨æ??æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ç?¶ä½¿ç?¨è??å??è©¦æ¸?ç©ºè³?æ??å¤¾æ??ï¼?æ??ç¤ºä½¿ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??æ²?æ??ä¸»æ?¨ç??é?µä»¶æ??ï¼?æ??ç¤ºä½¿ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "æ??ç¤ºä½¿ç?¨è??ä»¥ç¢ºèª?æ?¯å?¦ç«?å?³é?²å?¥é?¢ç·?"
-
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
 msgstr "ç?¶å?ªé?¤æ??å°?è³?æ??å¤¾ä¸ç??é?µä»¶æ??é¡¯ç¤ºæ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "ä½¿ç?¨è??æ¸?ç©ºæ??æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "ç?¶ä½¿ç?¨è??å?ªå¡«å¯«å¯?ä»¶å?¯æ?¬æ??æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ç?¶ä½¿ç?¨è??å??è©¦ä¸?æ¬¡é??å?? 10 å??æ??æ?´å¤?é?µä»¶æ??æ??ç¤ºä½¿ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:109
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+#: ../mail/evolution-mail.schemas.in.h:122
+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:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??ä¸?å?«æ?¶ä»¶è??æ??å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶æ??ï¼?æ??ç¤ºä½¿ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ç?¶ä½¿ç?¨è??å??è©¦å?³é??ä¸?æ?³è¦?ç?? HTML æ??æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "ç?¶æ¨?è¨?å¤?å??é?µä»¶æ??æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Put personalized signatures at the top of replies"
 msgstr "å°?å??äººå??ç°½å??æª?ç½®æ?¼å??ä¿¡é ?ç«¯"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put the cursor at the bottom of replies"
 msgstr "å??è¦?æ??å°?æ¸¸æ¨?ç½®æ?¼åº?é?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "è¾¨èª?æ??å?ä¸ç??è¡¨æ??ç¬¦è??ä¸¦å??ä»£æ??å??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "è¾¨èª?æ??å?ä¸ç??é?£çµ?ä¸¦å°?ä¹?å??ä»£ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "å?¨å?§é??ç??é?µä»¶å?·è¡?å??å?¾é?µä»¶æª¢æ?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "å?²å?ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Search for the sender photo in local address books"
 msgstr "å?¨æ?¬å?°ç«¯é??è¨?é??æ??å°?å¯?ä»¶è??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "é ?è¨å?³é?? HTML é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "é ?è¨å?³é?? HTML é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®ç??å¯?ä»¶è??é?»å?é?µä»¶æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "ä¼ºæ??å?¨å??æ¥é??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr "è¨ç?º TRUE è¡¨ç¤ºå?¨æ?¨æ?°å¯«é?µä»¶æ??ä¸?æ?³å?¨ç°½å??æª?å??å? å?¥ç°½å??æª?å??é??ç¬¦ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "é¡¯ç¤ºå??ç?«"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Show all message headers"
+msgstr "é¡¯ç¤ºæ??æ??é?µä»¶æª?é "
+
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Show all the headers when viewing a messages."
+msgstr "æª¢è¦?é?µä»¶æ??é¡¯ç¤ºæª?é ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
 msgstr "æ?æ?¾å??ç?«å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸é¡¯ç¤ºå?ªé?¤ç??é?µä»¶ (å? ä¸?å?ªé?¤è??)"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸é¡¯ç¤ºå?ªé?¤ç??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show image animations"
 msgstr "é¡¯ç¤ºå??ç?«å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Show original \"Date\" header value."
+msgstr "é¡¯ç¤ºå??å§?ç??ã??æ?¥æ??ã??æ¨?é æ?¸å?¼ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
 msgstr "é¡¯ç¤ºå¯?ä»¶è??ç??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
-msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
-msgstr "å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:139
-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: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:142
-msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
-msgstr "å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:143
-msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid "Show the email-address of the sender in a separate column in the message list."
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
 msgstr "å?¨é?µä»¶æ¸?å?®ç??ä¸ä»¥å??é?¢ç??æ¬?ä½?é¡¯ç¤ºå¯?ä»¶è??ç??é?»å?é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+"é¡¯ç¤ºå??å§?ç??ã??æ?¥æ??ã??æª?é ï¼?è?¥æ??å??ä¸?å??æ??æ??ä½¿ç?¨ç?¶å?°æ??é??ï¼?ã??å?¦å??æ°¸é? ä»¥ä½¿ç?¨è??å??å¥½ç??"
+"æ ¼å¼?å??æ?¬å?°æ??å??é¡¯ç¤ºã??æ?¥æ??ã??æª?é ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨é?µä»¶é?±è®?çª?æ ¼ä¸é¡¯ç¤ºå¯?ä»¶è??ç??ç?¸ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "è¡?å?§æ?¼å?æª¢æ?¥"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "æ?¼å?æª¢æ?¥é¡?è?²"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "æ?¼å?æª¢æ?¥èª?è¨?"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "è¨?é?±å°?è©±ç??é ?è¨é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "è¨?é?±å°?è©±ç??é ?è¨å¯¬åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "çµ?ç«¯æ©?å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "æ??å?é?µä»¶é??å?¶"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "å??å?¾é?£é?¤ç??é ?è¨å¤?æ??ç¨?å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "ä¸?æ¬¡å?·è¡?æ¸?ç©ºå??å?¾é?µä»¶ç??æ??é??ï¼?å¾?é?»è?¦ç´?å??å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "ä¸?æ¬¡å?·è¡?æ¸?å?®å??æ?¶ç?ç??æ??é??ï¼?å¾?ç´?å??å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+"é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨é?µä»¶æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?µä»¶"
+"æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®æ??é??ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??çµ?ç«¯æ©?å?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??è®?å??å¯¬åº¦å?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
+#: ../mail/evolution-mail.schemas.in.h:175
+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:159
-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."
-msgstr "é??è£¡æ±ºå®?äº?é?µä»¶å?§æ??å?¨ Evolution ä¸å?¯æ??ç??ç??æ??å¤§å®¹é??ã??é ?è¨ç??å¤§å°?æ?¯ 4MB / 4096 KBï¼?ä»¥ KB ä¾?æ??å®?ã??"
+#: ../mail/evolution-mail.schemas.in.h:176
+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."
+msgstr ""
+"é??è£¡æ±ºå®?äº?é?µä»¶å?§æ??å?¨ Evolution ä¸å?¯æ??ç??ç??æ??å¤§å®¹é??ã??é ?è¨ç??å¤§å°?æ?¯ 4MB / 4096 "
+"KBï¼?ä»¥ KB ä¾?æ??å®?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
-msgstr "é??æ?¯é ?è¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?ï¼?å?³ä½¿å·²å??ç?¨äº?å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??å¦?æ??å??ç?¨é??è£¡å??å?ºç??é ?è¨å¤?æ??ç¨?å¼?ï¼?ä¸¦ä¸?æ??å½±é?¿å?¶ä»?å?¯ç?¨ç??å¤?æ??ç¨?å¼?ã??"
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
+"é??æ?¯é ?è¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?ï¼?å?³ä½¿å·²å??ç?¨äº?å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??å¦?æ??å??ç?¨é??è£¡å??å?ºç??é ?"
+"è¨å¤?æ??ç¨?å¼?ï¼?ä¸¦ä¸?æ??å½±é?¿å?¶ä»?å?¯ç?¨ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:161
-msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
-msgstr "é??å??é?µå?¼å?ªè?½è®?å??ä¸?æ¬¡ï¼?ä¸¦æ??å?¨è®?å??å¾?è¨ç?ºã??falseã??ã??é??æ¨£æ??å??æ¶?å?¨æ¸?å?®ä¸å°?è©²é?µä»¶ç??é?¸å??ä¸¦ç§»é?¤å°?è©²è³?æ??å¤¾ç??é ?è¦½ã??"
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
+msgstr ""
+"é??å??é?µå?¼å?ªè?½è®?å??ä¸?æ¬¡ï¼?ä¸¦æ??å?¨è®?å??å¾?è¨ç?ºã??falseã??ã??é??æ¨£æ??å??æ¶?å?¨æ¸?å?®ä¸å°?è©²é?µä»¶ç??"
+"é?¸å??ä¸¦ç§»é?¤å°?è©²è³?æ??å¤¾ç??é ?è¦½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:162
-msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
-msgstr "æ¤é??é?°æ??è©²å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªè¨?æª?é ï¼?ä»¥å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é æ??é¡¯ç¤ºå?¨é?µä»¶æª¢è¦?ï¼?å??è¨å®?æ?? enabledã??"
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"æ¤é??é?°æ??è©²å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªè¨?æª?é ï¼?ä»¥å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?"
+"æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é æ??é¡¯ç¤ºå?¨é?µä»¶æª¢è¦?ï¼?å??è¨å®?æ?? enabledã??"
 
-#: ../mail/evolution-mail.schemas.in.h:163
-msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
-msgstr "é??å??é?¸é ?ç?¸é??æ?¼é?µå?¼ã??lookup_addressbookã??ï¼?æ?¯ç?¨ä¾?æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸æ?¥è©¢é?»å?é?µä»¶ä½?å??ä»¥ç?¨æ?¼å??å?¾é?µä»¶é??æ¿¾æ??ã??æ??é?¤å·²ç?¥é?£çµ¡äººå¯?å?ºç??é?µä»¶ã??å??è?½ã??"
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"é??å??é?¸é ?ç?¸é??æ?¼é?µå?¼ã??lookup_addressbookã??ï¼?æ?¯ç?¨ä¾?æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸æ?¥"
+"è©¢é?»å?é?µä»¶ä½?å??ä»¥ç?¨æ?¼å??å?¾é?µä»¶é??æ¿¾æ??ã??æ??é?¤å·²ç?¥é?£çµ¡äººå¯?å?ºç??é?µä»¶ã??å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "é??å??é?¸é ?è?½å??å?©å¢?é?²æ?¥æ?¶ç??é??åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
 msgstr "é??æ??è¨å®?å?¨é ?è¨é?µä»¶æ¸?å?®æª¢è¦?ä¸é¡¯ç¤ºä½?å??ç??é?·åº¦ï¼?è¶?é??ç??é?¨å??æ??é¡¯ç¤ºã??...ã??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
-msgstr "é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶é ?è¨ç?ºå±?é??æ??æ?¶æ?ºç??ç??æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
-msgstr "é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶è¦?ä¾?æ¯?å??é?µä»¶ç¾¤çµ?æ??æ?°ç??é?µä»¶æ??åº?ï¼?è??é??ä¾?ç?§é?µä»¶ç??æ?¥æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Thread the message list."
-msgstr "ä¸²æ?¥é?µä»¶æ¸?å?®ã??"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶é ?è¨ç?ºå±?é??æ??æ?¶æ?ºç??ç??æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Thread the message-list"
-msgstr "ä¸²æ?¥é?µä»¶æ¸?å?®"
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
+msgstr ""
+"é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶è¦?ä¾?æ¯?å??é?µä»¶ç¾¤çµ?æ??æ?°ç??é?µä»¶æ??åº?ï¼?è??é??ä¾?ç?§é?µä»¶ç??æ?¥æ??ã??"
+"Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
 msgstr "ä»¥ä¸»æ?¨ç?ºå?ºç¤?ä¸²æ?¥é?µä»¶æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "å°?é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "å°?é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ç??æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
 msgstr "é ?è¨å¸³è??ç?? UID å?ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ä½¿ç?¨è¡?å?§æ?¼å?æª¢æ?¥æ??å°?æ?¼é?¯å?ç??åº?ç·?é¡?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
 msgstr "ä½¿ç?¨ SpamAsssassin ä¼ºæ??ç¨?å¼?å??å®¢æ?¶ç«¯"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ä½¿ç?¨ SpamAsssassin ä¼ºæ??ç¨?å¼?å??å®¢æ?¶ç«¯ (spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "ä½¿ç?¨è?ªè¨?å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "ä½¿ç?¨è?ªè¨?å?å??ä¾?é¡¯ç¤ºé?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ (æ²?æ?? DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid "Use side-by-side or wide layout"
-msgstr "ä½¿ç?¨ç·?è²¼æ??å¯¬é??ç½®"
-
-#: ../mail/evolution-mail.schemas.in.h:182
-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:196
+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:183
-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:197
+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:184
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "è®?å??å¯¬åº¦å?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é ?è¨å?¨æ¯?å°?é?µä»¶å? å?¥è®?ä¿¡å??æ¢?ç??è¦?æ±?"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æ?¯å?¦å??ç?¨å?´é??å??ç??è³?æ??å¤¾å??ç¨±ç??ç?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
-msgstr "ç?¶é?µä»¶ä¸?å??å?« In-Reply-To æ?? References æª?é æ??ï¼?æ?¯å?¦æ??ç?§ä¸»æ?¨æ?¾å??é?µä»¶ç¾¤çµ?ã??"
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"ç?¶é?µä»¶ä¸?å??å?« In-Reply-To æ?? References æª?é æ??ï¼?æ?¯å?¦æ??ç?§ä¸»æ?¨æ?¾å??é?µä»¶ç¾¤çµ?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦ä¾?é?µä»¶ç¾¤çµ?ä¸æ??æ?°ç??é?µä»¶ä¾?æ??åº?ç?¸é??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼å¯¬åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??å¯¬åº¦ã??"
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:178
 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:603
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+msgid "Mail"
+msgstr "é?µä»¶"
+
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm è¼¸å?¥å?¨"
@@ -12702,696 +11737,525 @@ msgstr "Evolution Elm è¼¸å?¥å?¨"
 msgid "Import mail from Elm."
 msgstr "å¾? Elm å?¯å?¥é?µä»¶ã??"
 
-#: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../mail/importers/evolution-mbox-importer.c:115
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "ç?®ç??å?°è³?æ??å¤¾:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
+msgid "Select folder"
+msgstr "é?¸æ??è³?æ??å¤¾"
+
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "é?¸å??è³?æ??å¤¾ä¾?è¼¸å?¥"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../shell/e-shell-utils.c:218
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley é?µä»¶ä¿¡ç®± (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:261
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "å?¯å?¥ Berkeley é?µä»¶ä¿¡ç®±æ ¼å¼?è³?æ??å¤¾"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "æ£å?¨å?¯å?¥ä¿¡ç®±"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:454
-#: ../plugins/pst-import/pst-importer.c:560
-#: ../shell/e-shell-importer.c:555
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
 msgid "Importing `%s'"
 msgstr "æ£å?¨å?¯å?¥ â??%sâ??"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "æ??æ?? %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "è¼¸å?¥ç®¡é??è³?æ??"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:379
+#: ../modules/addressbook/addressbook-config.c:986
+msgid "Address Book"
+msgstr "é??è¨?é??"
+
+#: ../mail/importers/pine-importer.c:420
 msgid "Evolution Pine importer"
 msgstr "Evolution ç®¡é??è¼¸å?¥å?¨"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:421
 msgid "Import mail from Pine."
 msgstr "å¾? Pine å?¯å?¥é?µä»¶ã??"
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "é?µä»¶é??å?° %s"
 
-#: ../mail/mail-autofilter.c:235
-#: ../mail/mail-autofilter.c:274
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "é?µä»¶ä¾?è?ª %s "
 
-#: ../mail/mail-autofilter.c:258
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "ä¸»æ?¨æ?¯ %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s é?µä»¶å??è¡¨"
 
-#: ../mail/mail-autofilter.c:364
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "æ?°å¢?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/mail-component.c:573
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
-msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
-
-#: ../mail/mail-component.c:577
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d å°?å·²å?ªé?¤"
-msgstr[1] "%d å°?å·²å?ªé?¤"
-
-#: ../mail/mail-component.c:584
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d å°?å??å?¾"
-msgstr[1] "%d å°?å??å?¾"
-
-#: ../mail/mail-component.c:587
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d å??è??ç¨¿"
-msgstr[1] "%d å??è??ç¨¿"
-
-#: ../mail/mail-component.c:589
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d å°?å·²å?³é??"
-msgstr[1] "%d å°?å·²å?³é??"
-
-#: ../mail/mail-component.c:591
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d å°?æ?ªå?³é??"
-msgstr[1] "%d å°?æ?ªå?³é??"
-
-#: ../mail/mail-component.c:597
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d å°?æ?ªè®?ï¼?"
-msgstr[1] "%d å°?æ?ªè®?ï¼?"
-
-#: ../mail/mail-component.c:598
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "å?± %d å°?"
-msgstr[1] "å?± %d å°?"
-
-#: ../mail/mail-component.c:952
-msgid "New Mail Message"
-msgstr "æ?°å¢?é?µä»¶"
-
-#: ../mail/mail-component.c:953
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "é?µä»¶è¨?æ?¯(_M)"
-
-#: ../mail/mail-component.c:954
-msgid "Compose a new mail message"
-msgstr "ç·¨è¼¯æ?°ç??é?µä»¶è¨?æ?¯"
-
-#: ../mail/mail-component.c:960
-msgid "New Mail Folder"
-msgstr "æ?°é?µä»¶è³?æ??å¤¾"
-
-#: ../mail/mail-component.c:961
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "é?µä»¶è³?æ??å¤¾(_F)"
-
-#: ../mail/mail-component.c:962
-msgid "Create a new mail folder"
-msgstr "å»ºç«?æ?°é?µä»¶è³?æ??å¤¾"
-
-#: ../mail/mail-component.c:1109
-msgid "Failed upgrading Mail settings or folders."
-msgstr "å??ç´?é?µä»¶æ??è³?æ??å¤¾å¤±æ??ã??"
-
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(æ³¨æ??ï¼?é??è¦?é??æ?°å??å??æ¤æ??ç?¨ç¨?å¼?)"
 
-#: ../mail/mail-config.glade.h:3
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>æ¤ Evolution ç??æ?¬ä¸?æ?¯æ?´ SSL</b>"
-
-#: ../mail/mail-config.glade.h:4
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>å¯?ä»¶è??ç?¸ç??</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sig_natures</b>"
-msgstr "<b>ç°½ç« (_N)</b>"
-
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>ç½®é ?å¼µè²¼é?¸é ?</b> (ä¸?å»ºè°)"
 
-#: ../mail/mail-config.glade.h:7
-msgid "<b>_Languages</b>"
-msgstr "<b>èª?è¨?(_L)</b>"
-
-#: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">å¸³è??è³?è¨?</span>"
-
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">é©?è?</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">æ?°å¯«é?µä»¶</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">çµ?æ??</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">é ?è¨è¡?ç?º</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">å?ªé?¤é?µä»¶</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">é¡¯ç¤ºç??é?µä»¶æª?é (_H)</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">æ¨?ç±¤</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">è¼?å?¥å??ç??</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">é?µä»¶é¡¯ç¤º</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">é?µä»¶å?å??</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">é?µä»¶å??æ¢?</span>"
-
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">é?¸æ??æ?§è³?è¨?</span>"
-
-#: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">é?¸é ?</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">å?´å¯?é?±ç§?æ¬? (PGP/GPG)</span>"
-
-# zh_HK: msgstr "<span weight=\"bold\">æ??å?°ç?¨ç??å?å??</span>"
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">æ??å?°ç?¨ç??å?å??</span>"
+#: ../mail/mail-config.ui.h:3
+msgid "Account Information"
+msgstr "å¸³è??è³?è¨?"
 
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">ä»£ç??ä¼ºæ??å?¨è¨å®?</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">å¿?è¦?è³?è¨?</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">å®?å?¨ MIME (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">å®?å?¨æ?§</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">å·±å?³é??ç??å??è??ç¨¿é?µä»¶</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">ä¼ºæ??å?¨çµ?æ??</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">é©?è?é¡?å??(_A)</span>"
-
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "å¸³è??ç¸½ç®¡"
-
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
 msgstr "å? å?¥æ?°ç??ç°½å??æª?(_W)..."
 
-#: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "æ?°å¢?å?½ä»¤ç¨¿(_S)"
-
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.ui.h:5
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "ä½¿ç?¨æ¤å¸³è??æ??ä¸?å®?å?¨å¤?é??ç??é?µä»¶ç°½å??(_W)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??ä¹?å? å¯?æ?¬èº«(_F)"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ä¸?å®?å¯?é??å?¯æ?¬ (_Cc) çµ¦:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ä¸?å®?å¯?é??å¯?ä»¶å?¯æ?¬ (_Bcc) çµ¦:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "å? å¯?æ??æ°¸é? ä¿¡ä»»æ??ç??é?°å??å??è£¡ç??é??é?°(_T)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??æ°¸é? è?ªæ??å? å¯?(_M)"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "æ°¸é? è¦?æ±?è®?ä¿¡å??æ¢?(_D)"
 
-#: ../mail/mail-config.glade.h:45
-msgid ""
-"Attachment\n"
-"Inline\n"
-"Quoted"
-msgstr ""
-"é??ä»¶\n"
-"è¡?å?§\n"
-"å¼?æ??"
-
-#: ../mail/mail-config.glade.h:48
-msgid ""
-"Attachment\n"
-"Inline (Outlook style)\n"
-"Quoted\n"
-"Do not quote"
-msgstr ""
-"é??ä»¶\n"
-"è¡?å?§ (Outlook é¢¨æ ¼)\n"
-"å¼?æ??\n"
-"ä¸?è¦?å¼?ç?¨"
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "é©?è?"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "è?ªå??æ??å?¥è¡¨æ??ç¬¦è??(_E)"
 
-#: ../mail/mail-config.glade.h:53
-msgid "Baltic (ISO-8859-13)"
-msgstr "æ³¢ç¾?ç??æµ·èª?ç³» (ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:54
-msgid "Baltic (ISO-8859-4)"
-msgstr "æ³¢ç¾?ç??æµ·èª?ç³» (ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "å?å??é??(_H):"
 
-#: ../mail/mail-config.glade.h:56
-#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "æª¢æ?¥æ?¯æ?´ç??é¡?å??(_E) "
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "ä»¥è?ªè¨?æ¨?é æª¢æ?¥å??å?¾é?µä»¶(_S)"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "æª¢æ?¥å?§é??é?µä»¶æ?¯å?¦ç?ºå??å?¾é?µä»¶(_M)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "ç?¶æ??è¼¸å?¥æ??æª¢æ?¥æ?¼å?(_T)"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "æª¢æ?¥å?§é??ç??å??å?¾é?µä»¶è¨?æ?¯"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "æ¸?é?¤(_A)"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "æ¸?é?¤(_R)"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "æ?¼é?¯å?ç??é¡?è?²(_M):"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.ui.h:25
+msgid "Composing Messages"
+msgstr "æ£å?¨ç·¨è¼¯é?µä»¶"
+
+#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "çµ?æ??"
+
+#: ../mail/mail-config.ui.h:27
 msgid "Confirm _when expunging a folder"
 msgstr "å?ªé?¤è³?æ??å¤¾æ??ç¢ºèª?(_W)"
 
-#: ../mail/mail-config.glade.h:65
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"æ?å??æ?¨ï¼?é?µä»¶è¨å®?å·²ç¶?å®?æ??ã??\n"
-"\n"
-"æ?¨ç?¾å?¨å?¯ä»¥é??å§?ä½¿ç?¨ Evolution\n"
-"æ?¶ç?¼é?»å?é?µä»¶ã??\n"
-"\n"
-"è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å?è¨å®?ã??"
-
-#: ../mail/mail-config.glade.h:71
-msgid "De_fault"
-msgstr "é ?è¨å?¼(_F)"
+#: ../mail/mail-config.ui.h:29
+msgid "Default Behavior"
+msgstr "é ?è¨è¡?ç?º"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "é ?è¨å?å??ç·¨ç¢¼(_N):"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.ui.h:32
+msgid "Delete Mail"
+msgstr "å?ªé?¤é?µä»¶"
+
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "é?¢é??æ??å?ªé?¤å??å?¾é?µä»¶(_X)"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ç?ºå¤?é??ç??é?µä»¶å? ä¸?æ?¸ä½?ç°½ç«  [é ?è¨å?¼] (_U)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:36
+msgid "Displayed Message _Headers"
+msgstr "é¡¯ç¤ºç??é?µä»¶æª?é (_H)"
+
+#: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "ä¸?æ??ç??é?µä»¶å?§æ??ç??æ??å?å¤§å°?ä¸?é??(_Z)"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:38
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "è?¥å¯?ä»¶è??å?¨æ??ç??é??è¨?é??ä¸å°±ä¸?è¦?å°?é?µä»¶æ¨?è¨?ç?ºå??å?¾é?µä»¶(_K)"
 
-#: ../mail/mail-config.glade.h:79
-msgid "Done"
-msgstr "å®?æ??"
+#: ../mail/mail-config.ui.h:39
+msgid "Do not quote"
+msgstr "ä¸?ä½¿ç?¨å¼?æ??"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "è??ç¨¿å?£(_F):"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Email Accounts"
-msgstr "é?»å?é?µä»¶å¸³è??"
-
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "é?»å?é?µä»¶ä½?å??(_A):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "é?¢é??æ??æ¸?ç©ºå??æ?¶ç?è³?æ??å¤¾(_X)"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "å??ç?¨é?è¡?ç©ºç?½é?µ(_P)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "å??ç?¨æ??å°?è³?æ??å¤¾(_R)"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "å? å¯?æ??è?(_P):"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¤?é??ç??é?µä»¶ (é ?è¨å?¼)(_E)"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "å?ºå®?å¯¬åº¦(_X):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "å?ºå®?å¯¬åº¦å?å??(_E):"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "å?å??å?§å®¹"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "å°?é?µä»¶æ ¼å¼?å??ç?º _HTML"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E):"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML é?µä»¶"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP ä»£ç??ä¼ºæ??å?¨:"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "æª?é "
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "å¼·èª¿å¼?æ??ç?º(_Q)"
 
-#: ../mail/mail-config.glade.h:101
-msgid "If the server uses a non-standard port then specify the server address as \"server-name:port-number\""
-msgstr "å¦?æ??ä¼ºæ??å?¨ä½¿ç?¨é??æ¨?æº?é?£æ?¥å? å??ä»¥ã??ä¼ºæ??å?¨å??ç¨±:é?£æ?¥å? è??ã??ç??æ?¹å¼?æ??å®?ä¼ºæ??å?¨ä½?å??"
+#: ../mail/mail-config.ui.h:59
+msgid "Inline"
+msgstr "è¡?å?§"
+
+#: ../mail/mail-config.ui.h:60
+msgid "Inline (Outlook style)"
+msgstr "è¡?å?§ï¼?Outlook é¢¨æ ¼ï¼?"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:104
-#: ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æ¨?ç±¤"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "èª?è¨?è¡¨"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Mail Configuration"
-msgstr "é?µä»¶çµ?æ??"
+#: ../mail/mail-config.ui.h:65
+msgid "Loading Images"
+msgstr "æ£å?¨è¼?å?¥å??ç??"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "é?µä»¶æª?é è¡¨"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "ä¿¡ç®±ä½?ç½®"
 
-#: ../mail/mail-config.glade.h:110
-msgid "Message Composer"
-msgstr "é?µä»¶ç·¨è¼¯å?¨"
+#: ../mail/mail-config.ui.h:68
+msgid "Message Display"
+msgstr "é?µä»¶é¡¯ç¤º"
+
+#: ../mail/mail-config.ui.h:69
+msgid "Message Fonts"
+msgstr "é?µä»¶å?å??"
+
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr "é?µä»¶å??æ¢?"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "æ²?æ??ä»£ç??ä¼ºæ??å?¨çµ¦(_P):"
 
-#: ../mail/mail-config.glade.h:112
-msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr "æ³¨æ??ï¼?å?¨æ¨?ç±¤å??ç¨±ä¸ç??åº?ç·?æ?¯ç?¨ä¾?æ¨?è¨?é?¸å?®ä¸ç??æ?·å¾?é?µã??"
-
-#: ../mail/mail-config.glade.h:113
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+#: ../mail/mail-config.ui.h:73
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr "æ³¨æ??ï¼?å?¨é¦?æ¬¡é?£ç·?ä¹?å??å°?ä¸?æ??æ??ç¤ºæ?¨è¼¸å?¥å¯?ç¢¼"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦?æ??æ?¾å?°ç¬¦å??ç??è?ªè¨?å??å?¾é?µä»¶æ¨?é é??å??é?¸é ?å°±æ??è¢«å¿½ç?¥ã??"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:75
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "é?¸æ??æ?§ç??è³?è¨?"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "å??é«?(_G):"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG é??é?° ID:"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "å¯?ç¢¼(_W):"
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please configure the following account settings."
-msgstr "è«?å?¨è¨å®?ä¸?å??å¸³è??ç??è¨å®?å?¼ã??"
-
-#: ../mail/mail-config.glade.h:120
-msgid "Please enter a descriptive name for this account in the space below. This name will be used for display purposes only."
-msgstr "è«?å?¨ä¸?é?¢ç??ç©ºé??è¼¸å?¥æ??è¿°é??å??å¸³è??ç??å??ç¨±ã??é??å??å??ç¨±å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
-
-#: ../mail/mail-config.glade.h:121
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??æ?¨ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²è·¯æ??å??ä¾?æ??å??ã??"
-
-#: ../mail/mail-config.glade.h:122
-msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
-msgstr "è«?å?¨ä¸?é?¢è¼¸å?¥æ?¨ç??å??ç¨±å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??æ?¨å¸?æ??å?¨é??å?ºç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "é?£æ?¥å? :"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ç?¶å?³é??ç??é?µä»¶å?ªæ??æ??å®?å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??æ??é¡¯ç¤ºæ??ç¤º(_O)"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:83
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "å?´å¯?é?±ç§?æ¬? (PGP/GPG)"
+
+# zh_HK: msgstr "å??å?°å??å¿?é??"
+#: ../mail/mail-config.ui.h:85
+msgid "Printed Fonts"
+msgstr "å??å?°ç?¨å?å??"
+
+#: ../mail/mail-config.ui.h:86
+msgid "Proxy Settings"
+msgstr "ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Quoted"
+msgstr "å¼?æ??"
+
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "è¨?ä½?å¯?ç¢¼(_M)"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "å??è¦?å?°å??(_P):"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "è¨?ä½?å¯?ç¢¼(_P)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:92
+msgid "Required Information"
+msgstr "å¿?è¦?ç??è³?è¨?"
+
+#: ../mail/mail-config.ui.h:94
+msgid "SSL is not supported in this build of Evolution"
+msgstr "æ¤ Evolution ç??æ?¬ä¸?æ?¯æ?´ SSL"
+
+#: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
 msgstr "å?ªæ??å°?æ?¬å?°ç«¯é??è¨?é??ä¸ç??å¯?ä»¶è??ç?¸ç??(_E)"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "é?¸å??(_E)..."
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "å?³é??é?µä»¶å??æ¢?(_E):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
 msgstr "æ¨?æº?å?å??(_T):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:99
+msgid "Secure MIME (S/MIME)"
+msgstr "å®?å?¨å¼? MIME (S/MIME)"
+
+#: ../mail/mail-config.ui.h:101
+msgid "Select Drafts Folder"
+msgstr "é?¸æ??è??ç¨¿è³?æ??å¤¾"
+
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "é?¸æ?? HTML å?ºå®?å¯¬åº¦å?å??"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font for printing"
 msgstr "é?¸æ??ç?¨æ?¼å??å?°ç?? HTML å?ºå®?å¯¬åº¦å?å??"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "é?¸æ?? HTML å?¯è®?å¯¬åº¦å?å??"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font for printing"
 msgstr "é?¸æ??ç?¨æ?¼å??å?°ç?? HTML å?¯è®?å¯¬åº¦å?å??"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:106
+msgid "Select Sent Folder"
+msgstr "é?¸æ??å¯?ä»¶è³?æ??å¤¾"
+
+#: ../mail/mail-config.ui.h:107
+msgid "Sender Photograph"
+msgstr "å¯?ä»¶è??ç?¸ç??"
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "å?³é??é?µä»¶"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "å?³é??é?µä»¶è³?æ??å¤¾(_M):"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:110
+msgid "Sent and Draft Messages"
+msgstr "å¯?ä»¶è??è??ç¨¿é?µä»¶"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "ä¼ºæ??å?¨è¦?æ±?é©?è?(_V)"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:112
+msgid "Server Configuration"
+msgstr "ä¼ºæ??å?¨çµ?æ??"
+
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "ä¼ºæ??å?¨é¡?å??(_T):"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.ui.h:114
+msgid "Sig_natures"
+msgstr "ç°½å??æª?(_N)"
+
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
 msgstr "ç°½å??æ??è?(_N):"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "ç°½å??æª?(_U):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
-msgstr "ç°½å??"
-
-#: ../mail/mail-config.glade.h:146
-msgid "Signatures Table"
-msgstr "ç°½ç« è¡¨"
+msgstr "ç°½å??æª?"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "æ?¼å?æª¢æ?¥"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "å??è¦?æ??å¾?åº?é?¨é??å§?è¼¸å?¥(_T)"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.ui.h:121
 msgid "T_ype:"
 msgstr "é¡?å??(_Y):"
 
-#: ../mail/mail-config.glade.h:150
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+#: ../mail/mail-config.ui.h:122
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr "é??è£¡ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºå·²ç¶?å®?è£?å?å?¸ç??èª?è¨?ã??"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used for display purposes only."
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 "é??å??å?½ä»¤ç¨¿ç??è¼¸å?ºæ??ç?¨ä¾?ä½?ç?ºæ?¨ç??\n"
-"ç°½å??æª?ã??æ?¨æ??å®?ç??å??ç¨±å?ªæ??ä½?ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
+"ç°½å??æª?ã??æ?¨æ??å®?ç??å??ç¨±å?ªæ??ä½?ç?º\n"
+"é¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13399,215 +12263,244 @@ msgstr ""
 "è¼¸å?¥æ?³ç?¨ä¾?ä»£è¡¨é??å??å¸³è??ç??å??ç¨±ã??\n"
 "ä¾?å¦?ï¼?ã??å·¥ä½?ã??æ??ã??å??äººã??"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_E):"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "ä½¿ç?¨é©?è?(_N)"
 
-#: ../mail/mail-config.glade.h:157
-#: ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:701
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:441
 #: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/google-account-setup/google-source.c:700
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_N):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "å?¯è®?å¯¬åº¦(_A):"
 
-#: ../mail/mail-config.glade.h:159
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"æ¡è¿?ä½¿ç?¨ Evolution é?µä»¶çµ?æ??å?©ç??ã??\n"
-"\n"
-"æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
-
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "å? å?¥ç°½å??æª?(_A)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
 msgstr "ä¸?å®?è?ªç¶²è·¯ä¸?è¼?å??ç??(_A)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "é©?è?é¡?å??(_A)"
+
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
 msgstr "é ?è¨å??å?¾é?µä»¶å¤?æ??ç¨?å¼?(_D):"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "ç?´æ?¥é?£ç·?å?°ç¶²é??ç¶²è·¯(_D)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?ç°½ç½²æ??è°é??è«? (ç?¸å®¹æ?¼ _Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "è½?å¯?æ?¹å¼?(_F):"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "å??ä¿¡æ??ä¿?ç??å??å§?é?µä»¶ç??ç°½å??(_K)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.ui.h:140
+msgid "_Languages"
+msgstr "èª?è¨?(_L)"
+
+#: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
 msgstr "è¼?å?¥ç?±é?£çµ¡äººå¯?å?ºé?µä»¶ä¸ç??å??ç??(_L)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "å?ªå?¨æ?¬å?°é??è¨?é??æ?¥è©¢(_L)"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
 msgstr "è¨ç?ºæ??ç??é ?è¨å¸³è??(_M)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??(_M):"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "æ¨?ç¤ºé?µä»¶ç?ºå·²é?±è®?æ?¼(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
 msgstr "ä¸?å®?ä¸?è?ªç¶²è·¯ä¸?è¼?å??ç??(_N)"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "è·¯å¾?(_P):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.ui.h:149
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "ç?¶å?³é?? HTML é?µä»¶çµ¦ä¸?æ?³æ?¶å?°é??é¡?é?µä»¶ç??é?£çµ¡äººæ??é¡¯ç¤ºæ??ç¤º(_P)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ç?¶å?³é??æ²?æ??ä¸»æ?¨ç??é?µä»¶æ??é¡¯ç¤ºæ??ç¤º(_P)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "å??è¦?æ?¹å¼?(_R):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "å?½ä»¤ç¨¿(_S):"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??ä¼ºæ??å?¨(_S):"
 
-#: ../mail/mail-config.glade.h:183
-msgid "_Select..."
-msgstr "é?¸å??(_S)..."
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../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.glade.h:186
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "é¡¯ç¤ºå??ç?«å??ç??(_S)"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨é?µä»¶é ?è¦½é¡¯ç¤ºå¯?ä»¶è??ç?¸ç??(_S)"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "ç¸®ç? _To / Cc / Bcc æª?é ç?º"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "ä½¿ç?¨å®?å?¨é?£ç·?(_U):"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "ä½¿ç?¨ç³»çµ±é ?è¨å?¼(_U)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "ä½¿ç?¨è??å?¶ä»?æ??ç?¨ç¨?å¼?ç?¸å??ç??å?å??(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+msgid "a"
+msgstr "a"
+
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "å?°å??"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+msgid "b"
+msgstr "b"
+
+#: ../mail/mail-config.ui.h:166
 msgid "color"
 msgstr "è?²å½©"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 msgstr "æ??è¿°"
 
-#: ../mail/mail-config.glade.h:197
-msgid "seconds"
-msgstr "ç§?å¾?"
-
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>æ??å°?è³?æ??å¤¾ä¾?æº?</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">æ?¸ä½?ç°½å??</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">å? å¯?</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "æ??æ??å?¯ç?¨ç??é? ç«¯è³?æ??å¤¾"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local and active remote folders"
 msgstr "æ??æ??æ?¬å?°ç«¯å??å?¯ç?¨ç??é? ç«¯è³?æ??å¤¾"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local folders"
 msgstr "æ??æ??æ?¬å?°ç«¯è³?æ??å¤¾"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "å??å§?ä½?ç½®"
+
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "å·²å®?æ??(_M)"
 
-#: ../mail/mail-dialogs.glade.h:9
-#: ../mail/message-tag-followup.c:270
-msgid "Flag to Follow Up"
-msgstr "è¦?è·?é?¨ç??æ¨?å¹?"
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "æ?¸ä½?ç°½ç« "
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "ä¸?è¦?è½?å¯?"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "å? å¯?"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "è³?æ??å¤¾è¨?é?±"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Follow-Up"
+msgstr "è·?é?¨"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "For Your Information"
+msgstr "çµ¦æ?¨ç??è³?è¨?"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Forward"
+msgstr "è½?å¯?"
+
+#: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
 msgstr "æ??æ¬?å??ç´?"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.ui.h:15
+msgid "No Response Necessary"
+msgstr "ä¸?é??è¦?å??æ??"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Reply to All"
+msgstr "å?¨é?¨å??è¦?"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Review"
+msgstr "æª¢é?±"
+
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
 msgstr "ä¼ºæ??å?¨(_E):"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Search Folder Sources"
+msgstr "æ??å°?è³?æ??å¤¾ä¾?æº?"
+
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "ä¿?å?¨æ?§è³?è¨?"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "æ??å®?ç??è³?æ??å¤¾"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:25
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13615,43 +12508,42 @@ msgstr ""
 "æ?¨é?¸æ??è¦?è·?é?¨ç??é?µä»¶å·²å?¨ä¸?é?¢å??å?ºã??\n"
 "è«?å¾?ã??æ¨?å¹?ã??é?¸å?®ä¸é?¸æ??è·?é?¨ç??å??ä½?ã??"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "æ?¥å??æ??æ¬?(_A)"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "å?°æ??æ?¼(_D):"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
 msgstr "æ¨?å¹?(_F):"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:893
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:107
+#: ../mail/mail-ops.c:95
 msgid "Filtering Selected Messages"
 msgstr "é??æ¿¾é?¸æ??ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:254
 msgid "Fetching Mail"
 msgstr "æ?¥æ?¶é?µä»¶"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:562
+#: ../mail/mail-ops.c:585
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??æ¿¾å?¨ï¼?%s"
 
-#: ../mail/mail-ops.c:574
-#: ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13660,127 +12552,126 @@ msgstr ""
 "ç?¡æ³?é??å? è?³ %sï¼?%s\n"
 "æ?¹é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??ã??"
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:641
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??ï¼?%s"
 
-#: ../mail/mail-ops.c:724
-#: ../mail/mail-ops.c:805
+#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
 msgid "Sending message"
 msgstr "æ£å?¨å?³é??é?µä»¶"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ£å?¨å?³é??é?µä»¶ %d / %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:789
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ç?¡æ³?å?³é??ç¬¬ %d å??é?µä»¶ (å?± %d å??)"
 
-#: ../mail/mail-ops.c:763
-#: ../mail/mail-send-recv.c:701
+#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:765
-#: ../mail/mail-send-recv.c:703
+#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:877
-msgid "Saving message to folder"
-msgstr "å?²å?é?µä»¶å?°è³?æ??å¤¾"
+#: ../mail/mail-ops.c:905
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "å?²å?é?µä»¶å?°è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:954
+#: ../mail/mail-ops.c:982
 #, c-format
-msgid "Moving messages to %s"
-msgstr "å°?é?µä»¶ç§»å?° %s"
+msgid "Moving messages to '%s'"
+msgstr "å°?é?µä»¶ç§»å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:954
+#: ../mail/mail-ops.c:982
 #, c-format
-msgid "Copying messages to %s"
-msgstr "å°?é?µä»¶è¤?è£½å?° %s"
+msgid "Copying messages to '%s'"
+msgstr "å°?é?µä»¶è¤?è£½å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1171
+#: ../mail/mail-ops.c:1091
+#, c-format
+msgid "Scanning folders in '%s'"
+msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??å¤¾"
+
+#: ../mail/mail-ops.c:1199
 msgid "Forwarded messages"
 msgstr "å·²è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:1212
+#: ../mail/mail-ops.c:1240
 #, c-format
-msgid "Opening folder %s"
-msgstr "é??å??è³?æ??å¤¾ %s"
+msgid "Opening folder '%s'"
+msgstr "é??å??è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1277
+#: ../mail/mail-ops.c:1306
 #, c-format
-msgid "Retrieving quota information for folder %s"
-msgstr "å??å¾?è³?æ??å¤¾ %s ç??ç?¨é??é??é¡?è³?è¨?"
+msgid "Retrieving quota information for folder '%s'"
+msgstr "å??å¾?è³?æ??å¤¾ã??%sã??ç??ç?¨é??é??é¡?è³?è¨?"
 
-#: ../mail/mail-ops.c:1346
+#: ../mail/mail-ops.c:1378
 #, c-format
-msgid "Opening store %s"
-msgstr "é??å??è²¯è?? %s"
+msgid "Opening store '%s'"
+msgstr "é??å??è²¯è??ã??%sã??"
 
-#: ../mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1449
 #, c-format
-msgid "Removing folder %s"
-msgstr "ç§»é?¤è³?æ??å¤¾ %s"
+msgid "Removing folder '%s'"
+msgstr "ç§»é?¤è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1535
+#: ../mail/mail-ops.c:1567
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "è²¯è??è³?æ??å¤¾ã??%sã??"
+msgstr "æ£å?¨è²¯è??è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1598
+#: ../mail/mail-ops.c:1630
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æ¸?ç©ºå??å?²å?å¸³è?? '%s'"
 
-#: ../mail/mail-ops.c:1599
+#: ../mail/mail-ops.c:1631
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?²å?å¸³è?? '%s'"
 
-#: ../mail/mail-ops.c:1653
-msgid "Refreshing folder"
-msgstr "é??æ?°è¼?å?¥è³?æ??å¤¾"
+#: ../mail/mail-ops.c:1685
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "é??æ?°æ?´ç??è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1693
-#: ../mail/mail-ops.c:1743
-msgid "Expunging folder"
-msgstr "å?ªé?¤è³?æ??å¤¾"
+#: ../mail/mail-ops.c:1725
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "æ£å?¨å?ªå?»è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/mail-ops.c:1740
+#: ../mail/mail-ops.c:1770
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "æ¸?ç©º '%s' ç??å??æ?¶ç?"
+msgstr "æ¸?ç©ºã??%sã??ç??å??æ?¶ç?"
 
-#: ../mail/mail-ops.c:1741
+#: ../mail/mail-ops.c:1771
 msgid "Local Folders"
 msgstr "æ?¬æ©?è³?æ??å¤¾"
 
-#: ../mail/mail-ops.c:1822
-#, c-format
-msgid "Retrieving message %s"
-msgstr "å??å??é?µä»¶ %s"
-
-#: ../mail/mail-ops.c:1931
+#: ../mail/mail-ops.c:1967
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "å??å?? %d å°?é?µä»¶"
 msgstr[1] "å??å?? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "å?²å? %d å°?é?µä»¶"
 msgstr[1] "å?²å? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2136
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13789,12 +12680,11 @@ msgstr ""
 "å?²å?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
 " %s"
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2208
 msgid "Saving attachment"
 msgstr "å?²å?é??ä»¶"
 
-#: ../mail/mail-ops.c:2186
-#: ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13803,135 +12693,130 @@ msgstr ""
 "ä¸?è?½å»ºç«?è¼¸å?ºæª?æ¡?ï¼?%sï¼?\n"
 " %s"
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2249
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ç?¡æ³?å¯«å?¥è³?æ??ï¼?%s"
 
-#: ../mail/mail-ops.c:2354
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Disconnecting from %s"
-msgstr "ä¸æ?·è?? %s ç??é?£ç·?"
+msgid "Disconnecting from '%s'"
+msgstr "ä¸æ?·è??ã??%sã??ç??é?£ç·?"
 
-#: ../mail/mail-ops.c:2354
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Reconnecting to %s"
-msgstr "é??æ?°é?£ç·?å?° %s"
+msgid "Reconnecting to '%s'"
+msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:2450
+#: ../mail/mail-ops.c:2490
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æº?å??å¸³è??ã??%sã??é?¢ç·?å·¥ä½?"
 
-#: ../mail/mail-ops.c:2536
+#: ../mail/mail-ops.c:2576
 msgid "Checking Service"
 msgstr "æª¢æ?¥æ??å??"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:189
 msgid "Canceling..."
 msgstr "æ£å?¨å??æ¶?..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "å?³é??è??æ?¥æ?¶é?µä»¶"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:553
 msgid "Updating..."
 msgstr "æ?´æ?°ä¸..."
 
-#: ../mail/mail-send-recv.c:503
-#: ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
 msgid "Waiting..."
 msgstr "æ£å?¨ç?å¾?..."
 
-#: ../mail/mail-send-recv.c:814
+#: ../mail/mail-send-recv.c:873
 #, c-format
 msgid "Checking for new mail"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?èª?"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "è¼¸å?¥å¯?èª?"
 
-#: ../mail/mail-session.c:215
-#: ../plugins/exchange-operations/exchange-config-listener.c:705
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?ç¢¼"
 
-#: ../mail/mail-session.c:217
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "è¼¸å?¥å¯?ç¢¼"
 
-#: ../mail/mail-session.c:259
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "ä½¿ç?¨è??å·²å??æ¶?æ??ä½?ã??"
 
-#: ../mail/mail-signature-editor.c:202
-msgid "_Save and Close"
-msgstr "å?²å?å¾?é??é??(_S)"
-
-#: ../mail/mail-signature-editor.c:356
-msgid "Edit Signature"
-msgstr "ç·¨è¼¯ç°½å??æª?"
+#: ../mail/mail-session.c:663
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/mail-signature-editor.c:371
-msgid "_Signature Name:"
-msgstr "ç°½å??æª?å??ç¨±(_S):"
+#: ../mail/mail-session.c:669
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??å¸³è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:123
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "ç?¡æ³?å»ºç«?æ?«å?åº?å??ç?®é?? `%s'ï¼?%s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:153
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "æ£å?¨å??è©¦ç§»å??é?? mbox ä¾?æº? `%s' ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "è½?å¯?ç??é?µä»¶ - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:301
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "è³?æ??å¤¾ç?¡æ??:`%s'"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "è¨å®?æ??å°?è³?æ??å¤¾ï¼? %s"
 
-#: ../mail/mail-vfolder.c:234
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?° '%s:%s' ç??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:241
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:1067
+#: ../mail/mail-vfolder.c:1172
 msgid "Edit Search Folder"
 msgstr "ç·¨è¼¯æ??å°?è³?æ??å¤¾"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1265
 msgid "New Search Folder"
 msgstr "æ?°å¢?æ??å°?è³?æ??å¤¾"
 
@@ -13947,22 +12832,29 @@ msgstr "å·²ç¶?æ??å??ç¨±ç?ºã??{1}ã??ç??è³?æ??å¤¾å?å?¨ã??è«?ä½¿ç?¨ä¸?å??ç??å??ç¨±
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit."
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 msgstr ""
 "ä½?æ?¼ã??{1}ã??ç??é??ç©ºç?½è³?æ??å¤¾å·²ç¶?å?å?¨ã??\n"
 "\n"
 "æ?¨å?¯ä»¥é?¸æ??å¿½ç?¥æ¤è³?æ??å¤¾ã??è¦?å¯«æ??é??å? å®?ç??å?§å®¹æ??è??çµ?æ??ã??"
 
 #: ../mail/mail.error.xml.h:6
-msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr "ã??{1}ã??å·²è¦?æ±?å?³é??è®?ä¿¡å??æ¢?ã??æ?¯å?¦å?³é??è®?ä¿¡å??æ¢?çµ¦ {0}ï¼?"
 
 #: ../mail/mail.error.xml.h:7
-msgid "A signature already exists with the name \"{0}\". Please specify a different name."
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr "å·²ç¶?æ??å??ç¨±ç?ºã??{0}ã??ç??ç°½å??æª?å?å?¨ã??è«?ä½¿ç?¨ä¸?å??ç??å??ç¨±ã??"
 
 #: ../mail/mail.error.xml.h:8
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr "ç?ºé?µä»¶å? ä¸?æ??æ??ç¾©ç??ä¸»æ?¨ï¼?å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??æ?¨ç??é?µä»¶å??ä»?éº¼äº?æ??é??ã??"
 
 #: ../mail/mail.error.xml.h:9
@@ -13974,7 +12866,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é??å??å¸³è??ï¼?"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é??å??å¸³è??ä»¥å??å®?æ??æ??ç??ä»£ç??ä¼ºæ??å?¨ï¼?"
 
 #: ../mail/mail.error.xml.h:12
@@ -13982,11 +12875,15 @@ msgid "Are you sure you want to open {0} messages at once?"
 msgstr "æ?¨ç¢ºå®?è¦?ä¸?æ¬¡é??é??å?? {0} å°?é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr "è¦?æ°¸ä¹?ç§»é?¤æ??æ??è³?æ??å¤¾ä¸æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 msgstr "ç¢ºå®?è¦?æ°¸ä¹?ç§»é?¤è³?æ??å¤¾ã??{0}ã??ä¸æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:15
@@ -13994,195 +12891,198 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "è¦?å?³é?? HTML æ ¼å¼?ç??é?µä»¶?"
 
 #: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "è¦?å?³é??é?»å?é?µä»¶ä½?å??ç?¡æ??ç??é?µä»¶?"
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "è¦?å?³é??é?»å?é?µä»¶ä½?å??ç?¡æ??ç??é?µä»¶?"
+
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "è¦?å?³é??å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "è¦?å?³é??æ²?æ??ä¸»æ?¨ç??é?µä»¶ï¼?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because \"{0}\"."
 msgstr "å? ç?ºã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Because \"{2}\"."
 msgstr "å? ç?ºã??{2}ã??ã??"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "ç©ºç?½ç°½å??æª?"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "ä¸?è?½å? å?¥æ??å°?è³?æ??å¤¾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "ç?¡æ³?å°?ã??{0}ã??è³?æ??å¤¾è¤?è£½è?³ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create folder \"{0}\"."
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create temporary save directory."
 msgstr "ç?¡æ³?å»ºç«?æ?«æ??å?²å?ç?®é??ã??"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "ä¸?è?½å»ºç«?å?²å?ç?®é??ï¼?å? ç?ºã??{1}ã??"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete folder \"{0}\"."
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "ä¸?è?½å?ªé?¤ç³»çµ±è³?æ??å¤¾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "ä¸?è?½ç·¨è¼¯æ??å°?è³?æ??å¤¾ã??{0}ã??ï¼?å? ç?ºå®?ä¸?å?å?¨ã??"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ä¸?è?½å°?è³?æ??å¤¾ã??{0}ã??ç§»è?³ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{1}\""
 msgstr "ä¸?è?½é??å??ä¾?æº?ã??{1}ã??"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open source \"{2}\"."
 msgstr "ä¸?è?½é??å??ä¾?æº?ã??{2}ã??ã??"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot open target \"{2}\"."
 msgstr "ä¸?è?½é??å??ç?®æ¨?ã??{2}ã??ã??"
 
-#: ../mail/mail.error.xml.h:34
-msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
-msgstr "ä¸?è?½è®?å??æ??æ¬?æ¢?æ¬¾æª?æ¡?ã??{0}ã??ï¼?æ??è©²æ?¯å®?è£?å??é¡?é? æ??ç??ã??å?¨æ?¨å??æ??é??é ?æ??æ¬?ä¹?å??å°?ç?¡æ³?ä½¿ç?¨å®?ã??"
+#: ../mail/mail.error.xml.h:36
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
+msgstr ""
+"ä¸?è?½è®?å??æ??æ¬?æ¢?æ¬¾æª?æ¡?ã??{0}ã??ï¼?æ??è©²æ?¯å®?è£?å??é¡?é? æ??ç??ã??å?¨æ?¨å??æ??é??é ?æ??æ¬?ä¹?å??å°?ç?¡æ³?"
+"ä½¿ç?¨å®?ã??"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "ä¸?è?½å°?ã??{0}ã??é??æ?°å?½å??æ??ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "ä¸?è?½é??æ?°å?½å??æ??ç§»å??ç³»çµ±è³?æ??å¤¾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save changes to account."
 msgstr "ç?¡æ³?å?²å?å¸³è??è®?æ?´ã??"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to directory \"{0}\"."
 msgstr "ä¸?è?½å?²å?è?³ç?®é??ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot save to file \"{0}\"."
 msgstr "ä¸?è?½å?²å?è?³æª?æ¡?ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Cannot set signature script \"{0}\"."
 msgstr "ä¸?è?½è¨å®?ç°½å??æª?å?½ä»¤ç¨¿ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Check Junk Failed"
 msgstr "æª¢æ?¥å??å?¾é?µä»¶å¤±æ??"
 
 # (Abel) é?µç?¤ç??é?µæ??å¥½ä¸?è¯äº?
-#: ../mail/mail.error.xml.h:42
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "è«?æª¢æ?¥å¯?ç¢¼æ?¼å?æ?¯å?¦æ£ç¢ºã??è«?æ³¨æ??ï¼?å¾?å¤?å¯?ç¢¼å??å??å¤§å°?å¯«ï¼?æ?¨å?¯è?½æ??äº? Caps Lockã??"
-
-#: ../mail/mail.error.xml.h:43
-msgid "Could not save signature file."
-msgstr "ç?¡æ³?å?²å?ç°½ç« æª?æ¡?ã??"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "å?ªé?¤ã??{0}ã??ï¼?"
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"è«?æª¢æ?¥å¯?ç¢¼æ?¼å?æ?¯å?¦æ£ç¢ºã??è«?æ³¨æ??ï¼?å¾?å¤?å¯?ç¢¼å??å??å¤§å°?å¯«ï¼?æ?¨å?¯è?½æ??äº? Caps Lockã??"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "å?ªé?¤å¸³è??ï¼?"
+msgid "Could not save signature file."
+msgstr "ç?¡æ³?å?²å?ç°½ç« æª?æ¡?ã??"
 
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "æ?¯å?¦å?ªé?¤æ??å°?è³?æ??å¤¾ã??{0}ã??ä¸ç??é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "æ?¯å?¦å?ªé?¤æ??å°?è³?æ??å¤¾ä¸ç??é?µä»¶ï¼?"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "æ?¯å?¦æ?¾æ£?è®?æ?´ï¼?"
-
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "ä¸?è¦?å?ªé?¤(_E)"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do not delete"
 msgstr "ä¸?è¦?å?ªé?¤"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do not disable"
 msgstr "ä¸?è¦?å??ç?¨"
 
-#: ../mail/mail.error.xml.h:52
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
+#: ../mail/mail.error.xml.h:50
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
 msgstr "æ?¯å?¦è¦?å?¨æ?¬å?°ç«¯å??æ¥é?£äº?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??è³?æ??å¤¾ï¼?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "æ?¯å?¦è¦?å°?å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ï¼?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "è¦?å?²å?æ??å??ç??è®?æ?´ï¼?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "è¼¸å?¥å¯?ç¢¼ã??"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "è¼?å?¥é??æ¿¾å?¨å®?ç¾©æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "å?·è¡?ä½?æ¥æ??ï¼?ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "ç?¶ {0} æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "æª?æ¡?å?å?¨ä½?ç?¡æ³?è¦?å¯«ã??"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "æª?æ¡?å?å?¨ä½?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??æ?¨é?¸æ??ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:62
-msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+#: ../mail/mail.error.xml.h:60
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr "å¦?æ??æ?¨é?¸æ??å?ªé?¤è³?æ??å¤¾ï¼?å®?ç??æ??æ??å?§å®¹å??å?è³?æ??å¤¾å?§å®¹æ??æ°¸é? æ¶?å¤±ã??"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?æ??æ??ç??ä»£ç??ä¼ºæ??å?¨å¸³è??æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14190,137 +13090,156 @@ msgstr ""
 "å¦?æ??ç¹¼çº?ï¼?è©²å¸³è??ç??è³?è¨?ä»¥å??\n"
 "å®?æ??æ??ç??ä»£ç??ä¼ºæ??å?¨æ??æ°¸é? å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?å¸³è??è³?è¨?æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:67
-msgid "If you quit, these messages will not be sent until Evolution is started again."
+#: ../mail/mail.error.xml.h:65
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr "å¦?æ??æ?¨é?¸æ??çµ?æ??ï¼?å??æ¬¡å??å?? Evolution ä¹?å??ï¼?ä¸?æ??å?³é??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "Ignore"
 msgstr "å¿½ç?¥"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Invalid authentication"
 msgstr "ç?¡æ??ç??é©?è?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:68
+msgid "Mail Deletion Failed"
+msgstr "å?ªé?¤é?µä»¶å¤±æ??"
+
+#: ../mail/mail.error.xml.h:69
 msgid "Mail filters automatically updated."
 msgstr "é?µä»¶é??æ¿¾å?¨è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:72
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
-msgstr "å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??å? å?¥äº?æ¤æª?é ï¼?æ??æ°¸é? å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã??"
-
-#: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "å°?å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?"
+#: ../mail/mail.error.xml.h:70
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??å? å?¥"
+"äº?æ¤æª?é ï¼?æ??æ°¸é? å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶"
+"è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã??"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:71
 msgid "Missing folder."
 msgstr "é?ºæ¼?è³?æ??å¤¾ã??"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:73
 msgid "No sources selected."
 msgstr "æ?ªé?¸å??ä¾?æº?ã??"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:74
 msgid "Opening too many messages at once may take a long time."
 msgstr "ä¸?æ¬¡é??å??é??å¤?é?µä»¶å?¯è?½æ??è?±è²»è¨±å¤?æ??é??ã??"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:75
 msgid "Please check your account settings and try again."
 msgstr "è«?æª¢æ?¥å¸³è??è¨å®?ä¸¦å??è©¦ä¸?æ¬¡ã??"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:76
 msgid "Please enable the account or send using another account."
 msgstr "è«?å??ç?¨è©²å¸³è??æ??ä½¿ç?¨å?¶ä»?å¸³è??å?³é??ã??"
 
-#: ../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."
-msgstr "è«?å?¨ã??æ?¶ä»¶è??ï¼?ã??æ¬?ä½?è¼¸å?¥ä¸?å??æ??æ??ç??é?»å?é?µä»¶å?°å??ã??æ?¨å?¯ä»¥æ??ä¸?ä¸?è¼¸å?¥æ?¹å¡?æ??é??ç??ã??æ?¶ä»¶è??ï¼?ã??æ??é??ï¼?æ??å°?é?»å?é?µä»¶å?°å??ã??"
+#: ../mail/mail.error.xml.h:77
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"è«?å?¨ã??æ?¶ä»¶è??ï¼?ã??æ¬?ä½?è¼¸å?¥ä¸?å??æ??æ??ç??é?»å?é?µä»¶å?°å??ã??æ?¨å?¯ä»¥æ??ä¸?ä¸?è¼¸å?¥æ?¹å¡?æ??é??ç??"
+"ã??æ?¶ä»¶è??ï¼?ã??æ??é??ï¼?æ??å°?é?»å?é?µä»¶å?°å??ã??"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}"
 msgstr ""
 "è«?ç¢ºå®?ä»¥ä¸?æ?¶ä»¶è??å¸?æ??ä¸¦ä¸?å?¯ä»¥æ?¥æ?¶ HTML é?»å?é?µä»¶ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "è«?è¼¸å?¥å?¯ä¾?è¾¨è?é??å??ç°½å??æª?ç??ç?¨ç?¹å??ç¨±ã??"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "è«?ç¨?å??ã??"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "è½?ç§»è??é?µä»¶è³?æ??å¤¾ã??{0}ã??ç?¼ç??å??é¡?ã??"
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "æ?¥è©¢ä¼ºæ??å?¨"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "å??ä¼ºæ??å?¨æ?¥è©¢æ?¯æ?´ç??é©?è?æ¼?ç®?æ³?æ¸?å?®ã??"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?ã??"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤è³?æ??å¤¾ã??{0}ã??ä»¥å??å®?æ??æ??ç??å?è³?æ??å¤¾?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:86
 msgid "Report Junk Failed"
 msgstr "å??å ±å??å?¾é?µä»¶å¤±æ??"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:87
 msgid "Report Not Junk Failed"
 msgstr "å??å ±ç?ºé??å??å?¾é?µä»¶å¤±æ??"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:88
 msgid "Search Folders automatically updated."
 msgstr "æ??å°?è³?æ??å¤¾è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:89
 msgid "Send Receipt"
 msgstr "å?³é??å??æ¢?"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:90
 msgid "Signature Already Exists"
 msgstr "ç°½å??æª?å·²ç¶?å?å?¨"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:91
 msgid "Synchronize"
 msgstr "å??æ¥å??"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize folders locally for offline usage?"
 msgstr "æ?¯å?¦å??æ¥è³?æ??å¤¾ä»¥ä¾?é?¢ç·?ä½¿ç?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:97
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Evolution é??è¦?ç³»çµ±è³?æ??å¤¾æ??è?½æ£å¸¸ä½?æ¥ï¼?è??ä¸?è©²è³?æ??å¤¾ä¸?å?¯ä»¥é??æ?°å?½å??ã??ç§»å??æ??å?ªé?¤ã??"
+#: ../mail/mail.error.xml.h:93
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"Evolution é??è¦?ç³»çµ±è³?æ??å¤¾æ??è?½æ£å¸¸ä½?æ¥ï¼?è??ä¸?è©²è³?æ??å¤¾ä¸?å?¯ä»¥é??æ?°å?½å??ã??ç§»å??æ??å?ª"
+"é?¤ã??"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 "å?³é??ç??é?£çµ¡äººæ¸?å?®æ?¯è¨å®?æ??é?±è??æ¸?å?®æ?¶ä»¶è??ã??\n"
 "\n"
-"å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??æ?°å¢?æ¤æª?é ï¼?æ??å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?æ?¨æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã?? "
+"å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??æ?°å¢?"
+"æ¤æª?é ï¼?æ??å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?æ?¨æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶"
+"è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã?? "
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14334,7 +13253,7 @@ msgstr ""
 "    ã??{1}ã??\n"
 "è??ä¸?å·²æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14348,9 +13267,25 @@ msgstr ""
 "    ã??{1}ã??\n"
 "è??ä¸?å·²æ?´æ?°ã??"
 
+#: ../mail/mail.error.xml.h:107
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"ä¸?å??æ?¶ä»¶è??ç?¡æ³?è¾¨èª?ç?ºæ??æ??ç??é?µä»¶ä½?å??ï¼?\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"ä¸?å??æ?¶ä»¶è??ç?¡æ³?è¾¨èª?ç?ºæ??æ??ç??é?µä»¶ä½?å??ï¼?\n"
+"{0}"
+
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
-msgstr "ç¨?åº?æª?å¿?é ?å?å?¨è??ä¸?å?¯ä»¥å?·è¡?ã??"
+msgstr "å?½ä»¤ç¨¿æª?æ¡?å¿?é ?å?å?¨è??ä¸?å?¯ä»¥å?·è¡?ã??"
 
 #: ../mail/mail.error.xml.h:112
 msgid ""
@@ -14361,15 +13296,20 @@ msgstr ""
 "é??è¦?æ??ï¼?è«?ç§»è?³æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ï¼?ä»¥æ??å??æ?¹å¼?æ?°å¢?å®?ã??"
 
 #: ../mail/mail.error.xml.h:114
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr "å? ç?ºæ?¨æ²?æ??å??ç?¨é?¸æ??ç?¨ä¾?å¯?é??ç??å¸³è??ï¼?æ??ä»¥ç?¡æ³?å?³é??æ¤é?µä»¶ã??"
 
 #: ../mail/mail.error.xml.h:115
-msgid "This message cannot be sent because you have not specified any recipients"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "å? ç?ºæ?¨æ²?æ??æ??å®?ä»»ä½?æ?¶ä»¶è??ï¼?æ??ä»¥ç?¡æ³?å?³é??æ¤é?µä»¶"
 
 #: ../mail/mail.error.xml.h:116
-msgid "This server does not support this type of authentication and may not support authentication at all."
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr "æ¤ä¼ºæ??å?¨ä¸?æ?¯æ?´æ¤é©?è?é¡?å??è??ä¸?æ ¹æ?¬ä¸?æ?¯æ?´é©?è?ã??"
 
 #: ../mail/mail.error.xml.h:117
@@ -14377,7 +13317,9 @@ msgid "This signature has been changed, but has not been saved."
 msgstr "æ¤ç°½ç« å·²ç¶?è®?æ?´ï¼?ä½?å°?æ?ªå?²å?ã??"
 
 #: ../mail/mail.error.xml.h:118
-msgid "This will mark all messages as read in the selected folder and its subfolders."
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 msgstr "é??æ??å°?æ¨?ç¤ºé?¸å®?ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
 
 #: ../mail/mail.error.xml.h:119
@@ -14385,7 +13327,9 @@ msgid "Unable to connect to the GroupWise server."
 msgstr "ç?¡æ³?é?£ç·?è?³ GroupWise ä¼ºæ??å?¨ã??"
 
 #: ../mail/mail.error.xml.h:120
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 msgstr "ç?¡æ³?é??å??æ¤å¸³è??ç??è??ç¨¿è³?æ??å¤¾ã??æ?¯å?¦ä½¿ç?¨ç³»çµ±è??ç¨¿è³?æ??å¤¾ä»£æ?¿ï¼?"
 
 #: ../mail/mail.error.xml.h:121
@@ -14402,12 +13346,17 @@ msgstr "ä½¿ç?¨é ?è¨ç??è??ç¨¿è³?æ??å¤¾ï¼?"
 
 #: ../mail/mail.error.xml.h:124
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
 "è¦å??ï¼?å¾?æ??å°?è³?æ??å¤¾ä¸å?ªé?¤é?µä»¶å°?æ??è?ªæ?¨ç??æ?¬å?°æ??é? ç«¯è³?æ??å¤¾å?ªé?¤å¯¦é??ç??é?µä»¶ã??\n"
 "æ?¯å?¦ç¢ºå®?è¦?é??éº¼å??ï¼?"
 
+#: ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "æ?¨æ²?æ??è¶³å¤ ç??æ¬?é??å?ªé?¤æ¤å°?é?µä»¶ã??"
+
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "æ?¨æ²?æ??å¡«å?¥æ??æ??å¿?é ?ç??è³?è¨?ã??"
@@ -14431,7 +13380,8 @@ msgstr "æ?¨å¿?é ?æ??å®?ä¸?å??è³?æ??å¤¾ã??"
 #: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 "æ?¨å¿?é ?è?³å°?æ??å®?ä¸?å??è³?æ??å¤¾ç?¶æ??ä¾?æº?ã??\n"
 "å??å?¥é?¸å??è³?æ??å¤¾ï¼?ç?¶å¾?/æ??é?¸å??æ??æ??æ?¬å?°è³?æ??å¤¾ã??æ??æ??é? ç«¯è³?æ??å¤¾æ??äº?è??ç??é?¸ã??"
@@ -14452,6 +13402,11 @@ msgstr "æ?¾æ£?è®?æ?´(_D)"
 msgid "_Do not Synchronize"
 msgstr "ä¸?è¦?å??æ¥(_D)"
 
+#: ../mail/mail.error.xml.h:138
+#: ../modules/mail/e-mail-shell-view-actions.c:941
+msgid "_Empty Trash"
+msgstr "æ¸?ç??å??æ?¶ç?(_E)"
+
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "æ¸?é?¤(_E)"
@@ -14460,89 +13415,99 @@ msgstr "æ¸?é?¤(_E)"
 msgid "_Open Messages"
 msgstr "é??å??é?µä»¶(_O)"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1122
 msgid "Unseen"
 msgstr "æ?ªé?±è®?"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1123
 msgid "Seen"
 msgstr "å·²é?±è®?"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1124
 msgid "Answered"
 msgstr "å·²å??è¦?"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1125
 msgid "Forwarded"
 msgstr "è½?å¯?"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1126
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å??æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1127
 msgid "Multiple Messages"
 msgstr "å¤?å??é?µä»¶"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1131
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1132
 msgid "Lower"
 msgstr "ä½?"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1136
 msgid "Higher"
 msgstr "é«?"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1137
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1654
-#: ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1661
-#: ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "ä»?å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1670
+#: ../mail/message-list.c:1763
 msgid "Yesterday %l:%M %p"
 msgstr "æ?¨å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1682
+#: ../mail/message-list.c:1775
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1690
+#: ../mail/message-list.c:1783
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p %l:%M"
 
-#: ../mail/message-list.c:1692
+#: ../mail/message-list.c:1785
 msgid "%b %d %Y"
 msgstr "%Y/%m/%d"
 
+#: ../mail/message-list.c:2537
+msgid "Select all visible messages"
+msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?µä»¶"
+
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:652
+msgid "Shell Backend"
+msgstr "Shell å¾?ç«¯ç¨?å¼?"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3987
-#: ../mail/message-list.c:4462
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4885
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4299
-msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
-msgstr "æ²?æ??é?µä»¶ç¬¦å??æ?¨ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
+#: ../mail/message-list.c:4720
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"æ²?æ??é?µä»¶ç¬¦å??æ?¨ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4301
-msgid "There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."
+#: ../mail/message-list.c:4722
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
 msgstr "å?¨é??å??è³?æ??å¤¾ä¸å?ªæ??é?±è??ç??é?µä»¶ã??ä½¿ç?¨ æª¢è¦?->é¡¯ç¤ºé?±è??ç??é?µä»¶ ä¾?é¡¯ç¤ºå®?å??ã??"
 
-#: ../mail/message-list.c:4303
+#: ../mail/message-list.c:4724
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??å¤¾ä¸æ²?æ??é?µä»¶ã??"
 
@@ -14571,7 +13536,6 @@ msgid "Sent Messages"
 msgstr "å?³é??é?µä»¶"
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 #: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "å¤§å°?"
@@ -14580,62 +13544,28 @@ msgstr "å¤§å°?"
 msgid "Subject - Trimmed"
 msgstr "ä¸»æ?¨ - å·²æ?ªç?"
 
-#: ../mail/message-tag-followup.c:54
-msgid "Call"
-msgstr "å??å§?ä½?ç½®"
-
-#: ../mail/message-tag-followup.c:55
-msgid "Do Not Forward"
-msgstr "è«?å?¿è½?å¯?"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Follow-Up"
-msgstr "è·?é?¨"
-
-#: ../mail/message-tag-followup.c:57
-msgid "For Your Information"
-msgstr "çµ¦æ?¨ç??è³?è¨?"
-
-#: ../mail/message-tag-followup.c:58
-#: ../ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "è½?å¯?"
-
-#: ../mail/message-tag-followup.c:59
-msgid "No Response Necessary"
-msgstr "ä¸?é??è¦?å??æ??"
-
-#: ../mail/message-tag-followup.c:62
-#: ../ui/evolution-mail-message.xml.h:76
-msgid "Reply"
-msgstr "å??è¦?"
-
-#: ../mail/message-tag-followup.c:63
-#: ../ui/evolution-mail-message.xml.h:77
-msgid "Reply to All"
-msgstr "å?¨é?¨å??è¦?"
-
-#: ../mail/message-tag-followup.c:64
-msgid "Review"
-msgstr "æª¢é?±"
-
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 msgid "Body contains"
 msgstr "å?§æ??å??å?«"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Message contains"
 msgstr "é?µä»¶å??å?«"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "Sender contains"
 msgstr "å¯?ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "Subject contains"
 msgstr "ä¸»æ?¨å??å?«"
 
@@ -14643,13 +13573,2062 @@ msgstr "ä¸»æ?¨å??å?«"
 msgid "Subject or Addresses contains"
 msgstr "ä¸»æ?¨æ??é?»å?é?µä»¶ä½?å??å??å?«"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Recipients contains"
-msgstr "ä¸»æ?¨æ??æ?¶ä»¶è??å??å?«"
+#: ../modules/addressbook/addressbook-config.c:206
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯"
+"æ?´ SSL)ã??"
+
+#: ../modules/addressbook/addressbook-config.c:208
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯"
+"æ?´ TLS)ã??"
+
+#: ../modules/addressbook/addressbook-config.c:210
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?æ?¨ç??ä¼ºæ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??è¡¨ç¤ºæ?¨ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?æ?¨ç??"
+"å®?å?¨æ??æ¼?æ´?ã?? "
+
+#: ../modules/addressbook/addressbook-config.c:592
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "ç?¨æ?¼ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥è¡?äº?æ??(_B)"
+
+#: ../modules/addressbook/addressbook-config.c:628
+msgid "Copy _book content locally for offline operation"
+msgstr "è¤?è£½é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥(_B)"
+
+#: ../modules/addressbook/addressbook-config.c:736
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"é??æ?¯ LDAP ä¼ºæ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??è©¦é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?"
+"æ´½è©¢æ?¨ç??ç³»çµ±ç®¡ç??å?¡ï¼?ç?è§£æ?¨æ??è©²æ??å®?ç??å? ã??"
+
+#: ../modules/addressbook/addressbook-config.c:810
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è?æ?¨ç??æ?¹æ³?ã??æ³¨æ??è¦?è¨å®?æ¤é ?è?³ã??é?»å?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿"
+"å??å?å??æ?¨ç?? LDAP ä¼ºæ??å?¨ã??"
+
+#: ../modules/addressbook/addressbook-config.c:885
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"æ??å°?ç¯?å??æ??å®?ç¾©æ?¨æ?³å¾?ç¶²è·¯ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??\"sub\" ç??æ??å°?ç¯?å??æ??å??æ?¬æ??"
+"å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??ä¸?å??ã??ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
+
+#: ../modules/addressbook/addressbook-config.c:991
+msgid "Server Information"
+msgstr "ä¼ºæ??å?¨è³?è¨?"
+
+#: ../modules/addressbook/addressbook-config.c:996
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Details"
+msgstr "è©³ç´°è³?æ??"
+
+#: ../modules/addressbook/addressbook-config.c:997
+msgid "Searching"
+msgstr "æ£å?¨æ??å°?"
+
+#: ../modules/addressbook/addressbook-config.c:999
+msgid "Downloading"
+msgstr "ä¸?è¼?ä¸"
+
+#: ../modules/addressbook/addressbook-config.c:1205
+msgid "Address Book Properties"
+msgstr "é??è¨?é??å?§å®¹"
+
+#: ../modules/addressbook/addressbook-config.c:1207
+msgid "New Address Book"
+msgstr "æ?°é??è¨?é??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "è?ªå??å®?æ??é?·åº¦"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+msgid "Contact layout style"
+msgstr "é?£çµ¡äººé??ç½®æ?¹å¼?"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr "é?£çµ¡äººé ?è¦½çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+msgid "Contact preview pane position (vertical)"
+msgstr "é?£çµ¡äººé ?è¦½çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "å®?æ?? uris æ¸?å?®ç?? EFolderList xml"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "å®?æ?? uris æ¸?å?®ç?? EFolderList xml"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr "æ?¹å??ç?ºæ°´å¹³æ??é?£çµ¡äººé ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr "æ?¹å??ç?ºå??ç?´æ??é?£çµ¡äººé ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "é¡¯ç¤ºè?ªå??è£?é½?ç??å§?å??è??ä½?å??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "é¡¯ç¤ºé ?è¦½çª?æ ¼"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+"é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨é?£çµ¡äººæ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?£"
+"çµ¡äººæ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?£çµ¡äººæ¸?å?®æ??é??ã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "å?¨ Evolution å??è©¦è?ªå??å®?æ??ä¹?å??ï¼?å¿?é ?è¼¸å?¥ç??å?å??æ?¸ç?®ã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "ä¸?æ¬¡ç?¨æ?¼é?¸å??å??ç¨±å°?è©±ç??ç??è³?æ??å¤¾ URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "ä¸?æ¬¡ç?¨æ?¼é?¸å??å??ç¨±å°?è©±ç??ç??è³?æ??å¤¾ URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr "æ?¯å?¦å¼·å?¶é¡¯ç¤ºå?¨é ?ç?®ä¸è?ªå??è£?é½?ç??é?£çµ¡äººå§?å??è??é?»å?é?µä»¶ä½?å??ã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "æ?¯å?¦é¡¯ç¤ºé ?è¦½çª?æ ¼ã??"
+
+#: ../modules/addressbook/autocompletion-config.c:159
+msgid "Table column:"
+msgstr "è¡¨æ ¼æ¬?ï¼?"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "è?ªå??å®?æ??"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+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
+msgid "On LDAP Servers"
+msgstr "å?¨ LDAP ä¼ºæ??å?¨"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "é?£çµ¡äºº(_C)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:763
+msgid "Create a new contact"
+msgstr "å»ºç«?æ?°ç??é?£çµ¡äºº"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+msgctxt "New"
+msgid "Contact _List"
+msgstr "é?£çµ¡äººæ¸?å?®(_L)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:770
+msgid "Create a new contact list"
+msgstr "å»ºç«?æ?°ç??é?£çµ¡äººæ¸?å?®"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "é??è¨?é??(_B)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:693
+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
+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
+#, fuzzy
+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:613
+#: ../modules/calendar/e-task-shell-content.c:635
+#: ../modules/mail/e-mail-shell-content.c:688
+msgid "Preview is Visible"
+msgstr "é ?è¦½ç?ºé¡¯ç¤ºç??æ??"
+
+#: ../modules/addressbook/e-book-shell-content.c:385
+#: ../modules/calendar/e-memo-shell-content.c:614
+#: ../modules/calendar/e-task-shell-content.c:636
+#: ../modules/mail/e-mail-shell-content.c:689
+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 ""
+"Evolution é?£çµ¡äººè³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#: ../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"
+"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#: ../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 ""
+"Evolution å?²å?é?¨ä»½é?»è©±è??ç¢¼ç??æ?¹å¼?å·²ç¶?è®?æ?´ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#: ../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 ""
+"Evolution ç?? Palm Sync è®?æ?´è¨?é??å??æ? å°?æª?æ¡?å·²ç¶?è®?æ?´ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?æ?¨ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç?å??..."
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:181
+#: ../modules/calendar/e-cal-shell-sidebar.c:608
+#: ../modules/calendar/e-memo-shell-sidebar.c:543
+#: ../modules/calendar/e-task-shell-sidebar.c:541
+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-view-actions.c:262
+#: ../modules/addressbook/e-book-shell-view-actions.c:539
+msgid "Save as vCard"
+msgstr "å?²å?ç?º vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:670
+msgid "Co_py All Contacts To..."
+msgstr "è¤?è£½æ??æ??ç??é?£çµ¡äººå?°(_P)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:672
+msgid "Copy the contacts of the selected address book to another"
+msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??é?£çµ¡äººè¤?è£½å?°å?¦ä¸?å??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:677
+msgid "D_elete Address Book"
+msgstr "å?ªé?¤é??è¨?é??(_E)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:679
+msgid "Delete the selected address book"
+msgstr "å?ªé?¤é?¸å??ç??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:684
+msgid "Mo_ve All Contacts To..."
+msgstr "å°?æ??æ??ç??é?£çµ¡äººç§»å?°(_V)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:686
+msgid "Move the contacts of the selected address book to another"
+msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??é?£çµ¡äººç§»å??å?°å?¦ä¸?å??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:691
+msgid "_New Address Book"
+msgstr "æ?°å¢?é??è¨?é??(_N)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:698
+msgid "Address _Book Properties"
+msgstr "é??è¨?é??å±¬æ?§(_B)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:700
+msgid "Show properties of the selected address book"
+msgstr "é¡¯ç¤ºé?¸å??é??è¨?é??ç??å±¬æ?§"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:705
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
+msgid "_Rename..."
+msgstr "é??æ?°å?½å??(_R)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:707
+msgid "Rename the selected address book"
+msgstr "é??æ?°å?½å??é?¸å??ç??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:712
+msgid "S_ave Address Book as vCard"
+msgstr "å°?é??è¨?é??å?¦å?ç?º vC_ard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:714
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "å°?å·²é?¸å??é??è¨?é??ä¸ç??é?£çµ¡äººå?²å?ç?º vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:721
+msgid "Stop loading"
+msgstr "å??æ¢è¼?å?¥"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:726
+msgid "_Copy Contact To..."
+msgstr "è¤?è£½é?£çµ¡äººå?°(_C)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:728
+msgid "Copy selected contacts to another address book"
+msgstr "å°?é?¸å??ç??é?£çµ¡äººè¤?è£½å?°å?¦ä¸?å??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:733
+msgid "_Delete Contact"
+msgstr "å?ªé?¤é?£çµ¡äºº(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:740
+msgid "_Find in Contact..."
+msgstr "å?¨é?£çµ¡äººå?§å°?æ?¾(_F)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:742
+msgid "Search for text in the displayed contact"
+msgstr "æ??å°?é¡¯ç¤ºç??é?£çµ¡äººä¸ç??æ??å?"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:747
+msgid "_Forward Contact..."
+msgstr "è½?å¯?é?£çµ¡äºº(_F)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:749
+msgid "Send selected contacts to another person"
+msgstr "å?³é??é?¸å??é?£çµ¡äººçµ¦å?¶ä»?ä½¿ç?¨è??ã??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:754
+msgid "_Move Contact To..."
+msgstr "å°?é?£çµ¡äººç§»å?°(_M)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:756
+msgid "Move selected contacts to another address book"
+msgstr "å°?é?¸å??ç??é?£çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:761
+msgid "_New Contact..."
+msgstr "æ?°å¢?é?£çµ¡äºº(_N)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:768
+msgid "New Contact _List..."
+msgstr "æ?°å¢?é?£çµ¡äººæ¸?å?®(_L)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:775
+msgid "_Open Contact"
+msgstr "é??å??é?£çµ¡äºº(_O)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:777
+msgid "View the current contact"
+msgstr "æª¢è¦?ç?®å??ç??é?£çµ¡äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:782
+msgid "_Send Message to Contact..."
+msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:784
+msgid "Send a message to the selected contacts"
+msgstr "å?³é??é?µä»¶è?³é?¸å??ç??é?£çµ¡äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:791
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+msgid "_Actions"
+msgstr "å??ä½?(_A)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
+msgid "_Preview"
+msgstr "é ?è¦½(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-task-shell-view-actions.c:833
+msgid "_Delete"
+msgstr "å?ªé?¤(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
+msgid "_Properties"
+msgstr "å±¬æ?§(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
+msgid "_Save as vCard..."
+msgstr "å?²å?æ?? _vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Contact _Preview"
+msgstr "é?£çµ¡äººé ?è¦½(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show contact preview window"
+msgstr "é¡¯ç¤ºé?£çµ¡äººé ?è¦½è¦?çª?"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
+#: ../modules/calendar/e-memo-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../modules/mail/e-mail-shell-view-actions.c:1241
+msgid "_Classic View"
+msgstr "å?³çµ±æª¢è¦?(_C)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+msgid "Show contact preview below the contact list"
+msgstr "å?¨é?£çµ¡äººæ¸?å?®ä¸?æ?¹é¡¯ç¤ºé?£çµ¡äººé ?è¦½"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/mail/e-mail-shell-view-actions.c:1248
+msgid "_Vertical View"
+msgstr "å??ç?´æª¢è¦?(_V)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+msgid "Show contact preview alongside the contact list"
+msgstr "å?¨é?£çµ¡äººæ¸?å?®æ??é??é¡¯ç¤ºé?£çµ¡äººé ?è¦½"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+msgid "Any Category"
+msgstr "ä»»ä½?å??é¡?"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../modules/calendar/e-memo-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:961
+msgid "Unmatched"
+msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../shell/e-shell-content.c:516
+msgid "Advanced Search"
+msgstr "é?²é??æ??å°?"
+
+# zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
+#: ../modules/addressbook/e-book-shell-view-actions.c:935
+msgid "Print all shown contacts"
+msgstr "å??å?°æ??æ??é¡¯ç¤ºç??é?£çµ¡äºº"
+
+# zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??é?£çµ¡äºº"
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
+msgid "Preview the contacts to be printed"
+msgstr "é ?è¦½å°?è¦?å??å?°ç??é?£çµ¡äºº"
+
+# zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+msgid "Print selected contacts"
+msgstr "å??å?°å·²é?¸å??ç??é?£çµ¡äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:964
+msgid "Save as vCard..."
+msgstr "å?²å?ç?º vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
+msgid "Save selected contacts as a vCard"
+msgstr "å°?é?¸å??ç??é?£çµ¡äººå?²å?ç?º vCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:338
+msgid "_Forward Contacts"
+msgstr "è½?å¯?é?£çµ¡äºº(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:340
+msgid "_Forward Contact"
+msgstr "è½?å¯?é?£çµ¡äºº(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:371
+msgid "_Send Message to Contacts"
+msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)"
+
+#: ../modules/addressbook/e-book-shell-view.c:373
+msgid "_Send Message to List"
+msgstr "å?³é??é?µä»¶çµ¦æ¸?å?®(_S)"
+
+#: ../modules/addressbook/e-book-shell-view.c:375
+msgid "_Send Message to Contact"
+msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)"
+
+#: ../modules/addressbook/eab-composer-util.c:137
+msgid "Multiple vCards"
+msgstr "å¤?é?? vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:145
+#, c-format
+msgid "vCard for %s"
+msgstr "%s ç?? vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
+#, c-format
+msgid "Contact information"
+msgstr "é?£çµ¡äººè³?è¨?"
+
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information for %s"
+msgstr "%s ç??é?£çµ¡äººè³?è¨?"
+
+#: ../modules/addressbook/ldap-config.ui.h:1
+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"
+
+#: ../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
+msgid "B_rowse this book until limit reached"
+msgstr "ç??è¦½é??å??é??è¨?é??ç?´å?°é??å?¶(_R)"
+
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "Lo_gin:"
+msgstr "ç?»å?¥(_G):"
+
+#. 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
+#, fuzzy
+msgid "One"
+msgstr "ç?¡(_O)"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search Filter"
+msgstr "æ??å°?é??æ¿¾å?¨"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _base:"
+msgstr "æ??å°?èµ·é»?(_B):"
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid "Search _filter:"
+msgstr "æ??å°?é??æ¿¾å?¨(_F):"
+
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"æ??å°?é??æ¿¾å?¨æ?¯å?¨é?²è¡?æ??å°?æ??ä½¿ç?¨ç??ç?©ä»¶é¡?å??ã??å¦?æ??æ¤é ?æ²?æ??è¢«ä¿®æ?¹ï¼?é ?è¨ç??æ??å°?ç?®æ¨?æ?¯"
+"ã??personã??ç?©ä»¶é¡?å??ã??"
+
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:19
+#, fuzzy
+msgid "Sub"
+msgstr "ä¸?æ¨?"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "Supported Search Bases"
+msgstr "æ?¯æ?´ç??æ??å°?èµ·é»?"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Using distinguished name (DN)"
+msgstr "ä½¿ç?¨è¾¨èª?ç??å??ç¨± (DN)"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "Using email address"
+msgstr "ä½¿ç?¨é?»å?é?µä»¶å?°å??"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Download limit:"
+msgstr "ä¸?è¼?é??å?¶(_D):"
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Find Possible Search Bases"
+msgstr "å°?æ?¾å?¯è?½ç??æ??å°?å?ºç¤?(_F)"
+
+#: ../modules/addressbook/ldap-config.ui.h:26
+msgid "_Login method:"
+msgstr "ç?»å?¥æ?¹æ³?(_L):"
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Port:"
+msgstr "é?£æ?¥å? (_P):"
+
+#: ../modules/addressbook/ldap-config.ui.h:29
+msgid "_Search scope:"
+msgstr "æ??å°?ç¯?å??(_S):"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Timeout:"
+msgstr "æ??é??(_T):"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "_Use secure connection:"
+msgstr "ä½¿ç?¨å®?å?¨é?£ç·?(_U):"
+
+#: ../modules/addressbook/ldap-config.ui.h:33
+msgid "cards"
+msgstr "å??ç??"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "å?¯å?¥(_M)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "é?¸æ??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "é?¸æ??å·¥ä½?æ¸?å?®"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "å?¯å?¥è?³è¡?äº?æ??(_M)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+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-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:113
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "å?¨ç¶²ç«?ä¸?"
+
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../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
+msgid "Birthdays & Anniversaries"
+msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "_Appointment"
+msgstr "ç´?æ??(_A)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+msgid "Create a new appointment"
+msgstr "å»ºç«?ä¸?å??æ?°ç??ç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "å?¨æ?¥ç´?æ??(_P)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new all-day appointment"
+msgstr "å»ºç«?æ?°ç??å?¨æ?¥ç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-backend.c:460
+msgctxt "New"
+msgid "M_eeting"
+msgstr "æ??è°(_E)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:462
+msgid "Create a new meeting request"
+msgstr "å»ºç«?æ?°æ??è°è¦?æ±?"
+
+#: ../modules/calendar/e-cal-shell-backend.c:470
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "è¡?äº?æ??(_N)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1281
+msgid "Create a new calendar"
+msgstr "å»ºç«?æ?°è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2644
+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 ""
+"Evolution è¡?äº?æ??è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#. 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:152
+#: ../modules/calendar/e-memo-shell-sidebar.c:149
+#: ../modules/calendar/e-task-shell-sidebar.c:147
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"%s ç?¼ç??é?¯èª¤\n"
+"%s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:185
+msgid "Loading calendars"
+msgstr "æ£å?¨è¼?å?¥è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:425
+msgid "Calendar Selector"
+msgstr "è¡?äº?æ??é?¸æ??å?¨"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:598
+msgid "Date Navigator Widget"
+msgstr "æ?¥æ??ç??è¦½è¦?çª?å??ä»¶"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:599
+msgid "This widget displays a miniature calendar"
+msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºä¸?å??å°?å??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:609
+msgid "This widget displays groups of calendars"
+msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºè¡?äº?æ??ç??ç¾¤çµ?"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:770
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "é??å??å?¨ %s ç??è¡?äº?æ??"
+
+# zh_HK: msgstr "å??å?°"
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+msgid "Print"
+msgstr "å??å?°"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"æ¤ä½?æ¥æ??æ°¸ä¹?æ?§å?ªé?¤æ¯?é?¸å??æ??é??é??è??ç??æ??æ??äº?ä»¶ã??å¦?æ??æ?¨ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?äº?ä»¶ã??"
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
+msgid "Purge events older than"
+msgstr "æ¸?é?¤æ?©æ?¼é??æ®µæ??é??ç??äº?ä»¶"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:540
+msgid "Copying Items"
+msgstr "è¤?è£½é ?ç?®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:795
+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:1097
+msgid "event"
+msgstr "äº?ä»¶"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1099
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:507
+#: ../modules/calendar/e-task-shell-view-actions.c:632
+msgid "Save as iCalendar"
+msgstr "å?²å?ç?º iCalendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
+msgid "_Copy..."
+msgstr "è¤?è£½(_C)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+msgid "D_elete Calendar"
+msgstr "å?ªé?¤è¡?äº?æ??(_E)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+msgid "Delete the selected calendar"
+msgstr "å?ªé?¤é?¸å??ç??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+msgid "Go Back"
+msgstr "å??å¾?"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+msgid "Go Forward"
+msgstr "å??å??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+msgid "Select _Today"
+msgstr "é?¸æ??ä»?å¤©(_T)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+msgid "Select today"
+msgstr "é?¸å??ä»?æ?¥"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+msgid "Select _Date"
+msgstr "é?¸æ??æ?¥æ??(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+msgid "Select a specific date"
+msgstr "é?¸å??ç?¹å®?æ?¥æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1279
+msgid "_New Calendar"
+msgstr "æ?°å¢?è¡?äº?æ??(_N)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-task-shell-view-actions.c:804
+msgid "Purg_e"
+msgstr "æ¸?é?¤(_E)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+msgid "Purge old appointments and meetings"
+msgstr "å?ªé?¤è??ç´?æ??å??æ??è°"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-task-shell-view-actions.c:748
+msgid "Re_fresh"
+msgstr "é??æ?°æ?´ç??(_F)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+msgid "Refresh the selected calendar"
+msgstr "é??æ?°æ?´ç??é?¸å??ç??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+msgid "Rename the selected calendar"
+msgstr "é??æ?°å?½å??é?¸å??ç??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+msgid "Show _Only This Calendar"
+msgstr "å?ªé¡¯ç¤ºé??å??è¡?äº?æ??(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+msgid "Cop_y to Calendar..."
+msgstr "è¤?è£½è?³è¡?äº?æ??(_Y)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+msgid "_Delegate Meeting..."
+msgstr "å§?æ´¾æ??è°(_D)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+msgid "_Delete Appointment"
+msgstr "å?ªé?¤ç´?æ??(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+msgid "Delete selected appointments"
+msgstr "å?ªé?¤é?¸å??ç??ç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#, fuzzy
+msgid "Delete This _Occurrence"
+msgstr "å?ªé?¤é??å??äº?ä»¶(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+msgid "Delete this occurrence"
+msgstr "å?ªé?¤æ¤é?±æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#, fuzzy
+msgid "Delete All Occ_urrences"
+msgstr "æ?¯å?¦å?ªé?¤æ??æ??ç??ä¾¿æ¢?ï¼?"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+msgid "Delete all occurrences"
+msgstr "å?ªé?¤å?¨é?¨é?±æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+msgid "New All Day _Event..."
+msgstr "æ?°å¢?å?¨å¤©äº?ä»¶(_E)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+msgid "Create a new all day event"
+msgstr "å»ºç«?æ?°ç??å?¨å¤©äº?ä»¶"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-task-shell-view-actions.c:713
+msgid "_Forward as iCalendar..."
+msgstr "ä»¥ iCale_ndar è½?å¯?..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+msgid "New _Meeting..."
+msgstr "æ?°å¢?æ??è°(_M)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+msgid "Create a new meeting"
+msgstr "å»ºç«?æ?°ç??æ??è°"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+msgid "Mo_ve to Calendar..."
+msgstr "ç§»è?³è¡?äº?æ??(_V)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+msgid "New _Appointment..."
+msgstr "æ?°å¢?ç´?æ??(_A)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+msgid "Make this Occurrence _Movable"
+msgstr "å°?é??å??äº?ä»¶æ¨?ç¤ºæ??å?¯ç§»å??(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+msgid "_Open Appointment"
+msgstr "é??å??ç´?æ??(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+msgid "View the current appointment"
+msgstr "æª¢è¦?ç?®å??ç??ç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+msgid "_Reply"
+msgstr "å??è¦?(_R)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+msgid "Save as iCalendar..."
+msgstr "å?²å?ç?º iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+msgid "_Schedule Meeting..."
+msgstr "æ??è°æ??ç¨?(_S)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+msgid "Converts an appointment to a meeting"
+msgstr "å°?ç´?æ??è½?æ??ç?ºæ??è°"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+msgid "Conv_ert to Appointment..."
+msgstr "è½?æ??ç?ºç´?æ??(_E)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "Converts a meeting to an appointment"
+msgstr "å°?æ??è°è½?æ??ç?ºç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+msgid "Day"
+msgstr "å¤©"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+msgid "Show one day"
+msgstr "é¡¯ç¤ºä¸?å¤©"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+msgid "List"
+msgstr "æ¸?å?®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+msgid "Show as list"
+msgstr "é¡¯ç¤ºæ??æ¸?å?®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+msgid "Month"
+msgstr "æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+msgid "Show one month"
+msgstr "é¡¯ç¤ºä¸?å??æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+msgid "Week"
+msgstr "é?±"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+msgid "Show one week"
+msgstr "é¡¯ç¤ºä¸?é?±"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+msgid "Show one work week"
+msgstr "é¡¯ç¤ºä¸?å??å·¥ä½?é?±"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+msgid "Active Appointments"
+msgstr "é?²è¡?ä¸ç??ç´?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+msgid "Next 7 Days' Appointments"
+msgstr "æ?ªä¾? 7 å¤©ç??ç´?æ??(_P)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-memo-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:985
+msgid "Description contains"
+msgstr "æ??è¿°å??å?«"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:793
+#: ../modules/calendar/e-task-shell-view-actions.c:992
+msgid "Summary contains"
+msgstr "ä¸»æ?¨å??å?«"
+
+# zh_HK: msgstr "å??å?°é??å??è¡?äº?æ??"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+msgid "Print this calendar"
+msgstr "å??å?°é??å??è¡?äº?æ??"
+
+# zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+msgid "Preview the calendar to be printed"
+msgstr "é ?è¦½å°?è¦?å??å?°ç??è¡?äº?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+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:505
+msgid "memo"
+msgstr "å??å¿?é??"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
+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:647
+msgid "Create a new memo"
+msgstr "å»ºç«?æ?°ç??å??å¿?é??"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:652
+msgid "_Open Memo"
+msgstr "é??å??å??å¿?é??(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+msgid "View the selected memo"
+msgstr "æª¢è¦?é?¸å??ç??å??å¿?é??"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-task-shell-view-actions.c:797
+msgid "Open _Web Page"
+msgstr "é??å??ç¶²é ?(_W)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:819
+msgid "Print the selected memo"
+msgstr "å??å?°é?¸å??ç??å??å¿?é??"
+
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:630
+msgid "task"
+msgstr "å·¥ä½?"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:692
+msgid "_Assign Task"
+msgstr "æ??æ´¾å·¥ä½?(_A)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:769
+msgid "_Mark as Complete"
+msgstr "æ¨?ç¤ºç?ºå®?æ??(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+msgid "Mark selected tasks as complete"
+msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?ç¤ºæ??å®?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+msgid "_Mark as Incomplete"
+msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
+msgid "Mark selected tasks as incomplete"
+msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?ç¤ºæ??æ?ªå®?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:783
+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:785
+msgid "Create a new task"
+msgstr "å»ºç«?ä¸?å??æ?°ç??å·¥ä½?"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:790
+msgid "_Open Task"
+msgstr "é??å??å·¥ä½?(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+msgid "View the selected task"
+msgstr "æª¢è¦?é?¸å??ç??å·¥ä½?"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:834
+#: ../modules/calendar/e-task-shell-view-actions.c:1033
+msgid "_Save as iCalendar..."
+msgstr "å?²å?ç?º iCalendar[_S]..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
+msgid "Print the selected task"
+msgstr "å??å?°é?¸å??ç??å·¥ä½?"
+
+#: ../modules/calendar/e-memo-shell-backend.c:318
+msgctxt "New"
+msgid "Mem_o"
+msgstr "å??å¿?é??(_O)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "å?±ç?¨å??å¿?é??(_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:327
+msgid "Create a new shared memo"
+msgstr "å»ºç«?æ?°ç??å?±ç?¨å??å¿?é??"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "å??å¿?é??æ¸?å?®(_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+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:604
+msgid "The memo table model"
+msgstr "å??å¿?é??è¡¨æ ¼æ¨¡å??"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:182
+msgid "Loading memos"
+msgstr "æ£å?¨è¼?å?¥å??å¿?é??"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:396
+msgid "Memo List Selector"
+msgstr "å??å¿?é??æ¸?å?®é?¸æ??å?¨"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:544
+msgid "This widget displays groups of memo lists"
+msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºå??å¿?é??æ¸?å?®ç??ç¾¤çµ?"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:697
+#, c-format
+msgid "Opening memos at %s"
+msgstr "é??å??å?¨ %s ç??å??å¿?é??"
+
+# zh_HK: msgstr "å??å?°å??å¿?é??"
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+msgid "Print Memos"
+msgstr "å??å?°å??å¿?é??"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
+msgid "_Delete Memo"
+msgstr "å?ªé?¤å??å¿?é??(_D)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
+msgid "_Find in Memo..."
+msgstr "å?¨å??å¿?é??å?§å°?æ?¾(_F)..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+msgid "Search for text in the displayed memo"
+msgstr "æ??å°?é¡¯ç¤ºç??å??å¿?é??ä¸ç??æ??å?"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+msgid "D_elete Memo List"
+msgstr "å?ªé?¤å??å¿?é??æ¸?å?®(_E)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+msgid "Delete the selected memo list"
+msgstr "å?ªé?¤é?¸å??ç??å??å¿?é??æ¸?å?®"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
+msgid "_New Memo List"
+msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+msgid "Refresh the selected memo list"
+msgstr "é??æ?°æ?´ç??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../mail/searchtypes.xml.h:8
-msgid "Subject or Sender contains"
-msgstr "ä¸»æ?¨æ??å¯?ä»¶è??å??å?«"
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+msgid "Rename the selected memo list"
+msgstr "é??æ?°å?½å??é?¸å??ç??å??å¿?é??æ¸?å?®"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+msgid "Show _Only This Memo List"
+msgstr "å?ªé¡¯ç¤ºæ¤å??å¿?é??æ¸?å?®(_O)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
+msgid "Memo _Preview"
+msgstr "å??å¿?é??é ?è¦½(_P)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
+msgid "Show memo preview pane"
+msgstr "é¡¯ç¤ºå??å¿?é??é ?è¦½çª?æ ¼"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+msgid "Show memo preview below the memo list"
+msgstr "å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå??å¿?é??é ?è¦½"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+msgid "Show memo preview alongside the memo list"
+msgstr "å?¨å??å¿?é??æ¸?å?®æ??é??é¡¯ç¤ºå??å¿?é??é ?è¦½"
+
+# zh_HK: msgstr "å??å?°å??å¿?é??æ¸?å?®"
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+msgid "Print the list of memos"
+msgstr "å??å?°å??å¿?é??æ¸?å?®"
+
+# zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
+msgid "Preview the list of memos to be printed"
+msgstr "é ?è¦½å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:413
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d é ?å??å¿?é??"
+msgstr[1] "%d é ?å??å¿?é??"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:417
+#: ../modules/calendar/e-task-shell-view-private.c:567
+#, c-format
+msgid "%d selected"
+msgstr "å·²é?¸æ?? %d å??"
+
+#: ../modules/calendar/e-memo-shell-view.c:223
+msgid "Delete Memos"
+msgstr "å?ªé?¤å??å¿?é??"
+
+#: ../modules/calendar/e-memo-shell-view.c:225
+msgid "Delete Memo"
+msgstr "å?ªé?¤å??å¿?é??"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
+msgctxt "New"
+msgid "_Task"
+msgstr "å·¥ä½?(_T)"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
+
+#: ../modules/calendar/e-task-shell-backend.c:331
+msgid "Create a new assigned task"
+msgstr "å»ºç«?æ?°æ??å®?ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "å·¥ä½?æ¸?å?®(_K)"
+
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+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:626
+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 ""
+"Evolution å·¥ä½?è³?æ??å¤¾ç??ä½?ç½®å??é??å±¤å¾? Evolution 1.xå¾?å°±è®?æ?´äº?ã??\n"
+"\n"
+"ç?¶ Evolution ç§»è½?æ?¨ç??è³?æ??å¤¾æ??ï¼?è«?è??å¿?ç?å??..."
+
+#. 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:180
+msgid "Loading tasks"
+msgstr "æ£å?¨è¼?å?¥å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:394
+msgid "Task List Selector"
+msgstr "å·¥ä½?æ¸?å?®é?¸æ??å?¨"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:542
+msgid "This widget displays groups of task lists"
+msgstr "é??å??è¦?çª?å??ä»¶å?¯ä»¥é¡¯ç¤ºå·¥ä½?æ¸?å?®ç??ç¾¤çµ?"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:695
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "é??å??å?¨ %s ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:264
+msgid "Print Tasks"
+msgstr "å??å?°å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:574
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"é??å??å??ä½?æ??æ°¸ä¹?å?°æ¸?é?¤æ??æ??æ¨?ç¤ºç?ºå·²å®?æ??ç??å·¥ä½?ã??å¦?æ??æ?¨è¦?ç¹¼çº?ï¼?æ?¨å°?ä¸?è?½å¾©å??é??äº?å·¥"
+"ä½?ã??\n"
+"\n"
+"ç¢ºå®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:699
+msgid "_Delete Task"
+msgstr "å?ªé?¤å·¥ä½?(_D)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:706
+msgid "_Find in Task..."
+msgstr "å?¨å·¥ä½?å?§å°?æ?¾(_F)..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+msgid "Search for text in the displayed task"
+msgstr "æ??å°?é¡¯ç¤ºç??å·¥ä½?ä¸ç??æ??å?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:720
+msgid "Copy..."
+msgstr "è¤?è£½..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:727
+msgid "D_elete Task List"
+msgstr "å?ªé?¤å·¥ä½?æ¸?å?®(_E)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+msgid "Delete the selected task list"
+msgstr "å?ªé?¤é?¸å??ç??å·¥ä½?æ¸?å?®"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:734
+msgid "_New Task List"
+msgstr "æ?°å¢?å·¥ä½?æ¸?å?®(_N)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+msgid "Refresh the selected task list"
+msgstr "é??æ?°æ?´ç??é?¸å??ç??å·¥ä½?æ¸?å?®"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:757
+msgid "Rename the selected task list"
+msgstr "é??æ?°å?½å??é?¸å??ç??å·¥ä½?æ¸?å?®"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:762
+msgid "Show _Only This Task List"
+msgstr "å?ªé¡¯ç¤ºæ¤å·¥ä½?æ¸?å?®(_O)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:776
+msgid "Mar_k as Incomplete"
+msgstr "æ¨?ç¤ºç?ºæ?ªå®?æ??(_K)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:806
+msgid "Delete completed tasks"
+msgstr "å?ªé?¤å·²å®?æ??ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:881
+msgid "Task _Preview"
+msgstr "å·¥ä½?é ?è¦½(_P)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:883
+msgid "Show task preview pane"
+msgstr "é¡¯ç¤ºå·¥ä½?é ?è¦½çª?æ ¼"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:904
+msgid "Show task preview below the task list"
+msgstr "å?¨å·¥ä½?æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå·¥ä½?é ?è¦½"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+msgid "Show task preview alongside the task list"
+msgstr "å?¨å·¥ä½?æ¸?å?®æ??é??é¡¯ç¤ºå·¥ä½?é ?è¦½"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+msgid "Active Tasks"
+msgstr "é?²è¡?ä¸ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Completed Tasks"
+msgstr "å·²å®?æ??ç??å·¥ä½? "
+
+#: ../modules/calendar/e-task-shell-view-actions.c:940
+msgid "Next 7 Days' Tasks"
+msgstr "æ?ªä¾? 7 å¤©ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:947
+msgid "Overdue Tasks"
+msgstr "é??æ??ç??å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:954
+msgid "Tasks with Attachments"
+msgstr "æ??é??ä»¶ç??å·¥ä½?"
+
+# zh_HK: msgstr "å??å?°å·¥ä½?æ¸?å?®"
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
+msgid "Print the list of tasks"
+msgstr "å??å?°å·¥ä½?æ¸?å?®"
+
+# zh_HK: msgstr "é ?è¦½å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
+msgid "Preview the list of tasks to be printed"
+msgstr "é ?è¦½å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
+
+#: ../modules/calendar/e-task-shell-view-private.c:461
+msgid "Expunging"
+msgstr "é?¤å?»ä¸"
+
+#: ../modules/calendar/e-task-shell-view-private.c:563
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d é ?å·¥ä½?"
+msgstr[1] "%d é ?å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view.c:351
+msgid "Delete Tasks"
+msgstr "å?ªé?¤å·¥ä½?"
+
+#: ../modules/calendar/e-task-shell-view.c:353
+msgid "Delete Task"
+msgstr "å?ªé?¤å·¥ä½?"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, 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
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../modules/mail/e-mail-shell-backend.c:168
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "é?µä»¶è¨?æ?¯(_M)"
+
+#: ../modules/mail/e-mail-shell-backend.c:170
+msgid "Compose a new mail message"
+msgstr "ç·¨è¼¯æ?°ç??é?µä»¶è¨?æ?¯"
+
+#: ../modules/mail/e-mail-shell-backend.c:178
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "é?µä»¶è³?æ??å¤¾(_F)"
+
+#: ../modules/mail/e-mail-shell-backend.c:180
+msgid "Create a new mail folder"
+msgstr "å»ºç«?æ?°é?µä»¶è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-backend.c:199
+msgid "Mail Accounts"
+msgstr "é?µä»¶å¸³è??"
+
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Mail Preferences"
+msgstr "é?µä»¶å??å¥½è¨å®?"
+
+#: ../modules/mail/e-mail-shell-backend.c:215
+msgid "Composer Preferences"
+msgstr "é?µä»¶ç·¨è¼¯å?¨å??å¥½è¨å®?"
+
+#: ../modules/mail/e-mail-shell-backend.c:223
+msgid "Network Preferences"
+msgstr "ç¶²è·¯å??å¥½è¨å®?"
+
+#: ../modules/mail/e-mail-shell-content.c:678
+msgid "Group by Threads"
+msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?"
+
+#: ../modules/mail/e-mail-shell-content.c:679
+msgid "Whether to group messages by threads"
+msgstr "æ?¯å?¦ä¾?ç?¸é??é?µä»¶ä»¥ç¾¤çµ?æ?¹å¼?é¡¯ç¤º"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view.c:526
+msgid "_Disable Account"
+msgstr "å??ç?¨å¸³è??(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:915
+msgid "Disable this account"
+msgstr "å??ç?¨é??å??å¸³è??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:920
+msgid "C_reate Search Folder From Search..."
+msgstr "å¾?æ??å°?å»ºç«?æ??å°?è³?æ??å¤¾(_R)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:927
+msgid "_Download Messages for Offline Usage"
+msgstr "ä¸?è¼?é?¢ç·?ä½¿ç?¨ç??é?µä»¶(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:929
+msgid "Download messages of accounts and folders marked for offline"
+msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??å¸³è??/è³?æ??å¤¾ä¹?é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:934
+msgid "Empty _Trash"
+msgstr "æ¸?ç??å??æ?¶ç?(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:936
+#: ../modules/mail/e-mail-shell-view-actions.c:943
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "æ°¸ä¹?ç§»é?¤å?¨æ??æ??è³?æ??å¤¾å?§ç??å·²å?ªé?¤ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:948
+msgid "Fl_ush Outbox"
+msgstr "æ¸?ç??å¯?ä»¶å?£(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:955
+msgid "_Copy Folder To..."
+msgstr "è¤?è£½è³?æ??å¤¾å?°(_C)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:957
+msgid "Copy the selected folder into another folder"
+msgstr "è¤?è£½å·²é?¸å®?ç??è³?æ??å¤¾å?°å?¦ä¸?å??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:964
+msgid "Permanently remove this folder"
+msgstr "æ°¸ä¹?ç§»é?¤é??å??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:969
+msgid "E_xpunge"
+msgstr "å?ªé?¤(_X)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:971
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "æ°¸ä¹?ç§»é?¤å?¨é??å??è³?æ??å¤¾å?§å·²å?ªé?¤ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+msgid "Mar_k All Messages as Read"
+msgstr "æ¨?ç¤ºæ??æ??é?µä»¶ç?ºå·²é?±è®?(_K)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:978
+msgid "Mark all messages in the folder as read"
+msgstr "å°?è³?æ??å¤¾ä¸å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:983
+msgid "_Move Folder To..."
+msgstr "ç§»å??è³?æ??å¤¾å?°(_M)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:985
+msgid "Move the selected folder into another folder"
+msgstr "å°?é?¸å®?ç??è³?æ??å¤¾ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:990
+msgid "_New..."
+msgstr "æ?°å¢?(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:992
+msgid "Create a new folder for storing mail"
+msgstr "å»ºç«?ä¸?å??æ?°è³?æ??å¤¾ä»¥å?²å?é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:999
+msgid "Change the properties of this folder"
+msgstr "è®?æ?´é??å??è³?æ??å¤¾ç??å±¬æ?§"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
+msgid "Refresh the folder"
+msgstr "é??æ?°è¼?å?¥è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
+msgid "Change the name of this folder"
+msgstr "è®?æ?´é??å??è³?æ??å¤¾ç??å??ç¨±"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1018
+msgid "Select Message _Thread"
+msgstr "é?¸æ??é?µä»¶æª?é (_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
+msgid "Select all messages in the same thread as the selected message"
+msgstr "é?¸æ??æ??æ??ç?¸é??ç??é?µä»¶ç?ºé?¸å®?ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1025
+msgid "Select Message S_ubthread"
+msgstr "é?¸æ??é?µä»¶å?ç¾¤çµ?(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
+msgid "Select all replies to the currently selected message"
+msgstr "é?¸æ??æ??æ??å??è¦?é?¸å®?é?µä»¶ç??ä¿¡"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
+msgid "_Unsubscribe"
+msgstr "å??æ¶?è¨?é?±(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
+msgid "Unsubscribe from the selected folder"
+msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1039
+msgid "_New Label"
+msgstr "æ?°å¢?æ¨?ç±¤(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1046
+msgid "N_one"
+msgstr "æ²?æ??(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1053
+msgid "Hide _Read Messages"
+msgstr "é?±è??å·²é?±è®?ç??é?µä»¶(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1055
+msgid "Temporarily hide all messages that have already been read"
+msgstr "å°?å·²é?±è®?ç??é?µä»¶æ?«æ??é?±è??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1060
+msgid "Hide S_elected Messages"
+msgstr "é?±è??é?¸æ??ç??é?µä»¶(_E)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1062
+msgid "Temporarily hide the selected messages"
+msgstr "å°?é?¸å®?ç??é?µä»¶æ?«æ??é?±è??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
+msgid "Show Hidde_n Messages"
+msgstr "é¡¯ç¤ºé?±è??ç??é?µä»¶(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1069
+msgid "Show messages that have been temporarily hidden"
+msgstr "é¡¯ç¤ºæ?«æ??é?±è??ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1090
+msgid "Cancel the current mail operation"
+msgstr "å??æ¶?ç?®å??é?µä»¶æ??ä½?ç??è¡?å??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+msgid "Collapse All _Threads"
+msgstr "æ?¶æ?ºæ??æ??ç?¸é??é?µä»¶(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
+msgid "Collapse all message threads"
+msgstr "æ?¶æ?ºæ??æ??ç??ç?¸é??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1102
+msgid "E_xpand All Threads"
+msgstr "å±?é??æ??æ??ç?¸é??é?µä»¶(_X)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1104
+msgid "Expand all message threads"
+msgstr "å±?é??æ??æ??ç??ç?¸é??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
+msgid "_Message Filters"
+msgstr "é?µä»¶è¦?å??(_M)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1111
+msgid "Create or edit rules for filtering new mail"
+msgstr "ç?ºæ?°é?µä»¶å»ºç«?æ??ç·¨è¼¯é??æ¿¾è¦?å??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1116
+msgid "Search F_olders"
+msgstr "æ??å°?è³?æ??å¤¾(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1118
+msgid "Create or edit search folder definitions"
+msgstr "å»ºç«?æ??ç·¨è¼¯æ??å°?è³?æ??å¤¾ç??å®?ç¾©"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1123
+msgid "_Subscriptions..."
+msgstr "è¨?é?±(_S)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1125
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "è¨?é?±æ??å??æ¶?è¨?é?±å?¨é? ç«¯ä¼ºæ??å?¨ç??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1132
+msgid "F_older"
+msgstr "è³?æ??å¤¾(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
+msgid "_Label"
+msgstr "æ¨?ç±¤(_L)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1179
+msgid "_New Folder..."
+msgstr "æ?°å¢?è³?æ??å¤¾(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
+msgid "Hide _Deleted Messages"
+msgstr "é?±è??å·²å?ªé?¤é?µä»¶(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??ä»¥å?ªé?¤ç·?ç??å½¢å¼?é¡¯ç¤º"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
+msgid "Show Message _Preview"
+msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½(_P)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1214
+msgid "Show message preview pane"
+msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½çª?æ ¼"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
+msgid "_Group By Threads"
+msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?(_G)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
+msgid "Threaded message list"
+msgstr "ç?¸é??é?µä»¶æ¸?å?®"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
+msgid "Show message preview below the message list"
+msgstr "å?¨é?µä»¶æ¸?å?®ä¸?æ?¹é¡¯ç¤ºé?µä»¶é ?è¦½"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
+msgid "Show message preview alongside the message list"
+msgstr "å?¨é?µä»¶æ¸?å?®æ??é??é¡¯ç¤ºé?µä»¶é ?è¦½"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
+msgid "All Messages"
+msgstr "æ??æ??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1265
+msgid "Important Messages"
+msgstr "é??è¦?é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
+msgid "Last 5 Days' Messages"
+msgstr "æ??è¿? 5 å¤©ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
+msgid "Messages Not Junk"
+msgstr "é??å??å?¾é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
+msgid "Messages with Attachments"
+msgstr "æ??é??ä»¶ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1293
+msgid "No Label"
+msgstr "ç?¡æ¨?ç±¤"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
+msgid "Read Messages"
+msgstr "å·²è®?é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
+msgid "Recent Messages"
+msgstr "æ??è¿?ç??é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
+msgid "Unread Messages"
+msgstr "æ?ªè®?é?µä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
+msgid "Subject or Addresses contain"
+msgstr "ä¸»æ?¨æ??é?»å?é?µä»¶ä½?å??å??å?«"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+msgid "All Accounts"
+msgstr "æ??æ??ç??å¸³è??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1383
+msgid "Current Account"
+msgstr "ç?®å??ç??å¸³è??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1390
+msgid "Current Folder"
+msgstr "ç?®å??ç??è³?æ??å¤¾"
+
+#: ../modules/mail/e-mail-shell-view-private.c:836
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
+msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
+
+#: ../modules/mail/e-mail-shell-view-private.c:847
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d å°?å·²å?ªé?¤"
+msgstr[1] "%d å°?å·²å?ªé?¤"
+
+#: ../modules/mail/e-mail-shell-view-private.c:853
+#: ../modules/mail/e-mail-shell-view-private.c:860
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d å°?å??å?¾"
+msgstr[1] "%d å°?å??å?¾"
+
+#: ../modules/mail/e-mail-shell-view-private.c:866
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d å??è??ç¨¿"
+msgstr[1] "%d å??è??ç¨¿"
+
+#: ../modules/mail/e-mail-shell-view-private.c:872
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d å°?æ?ªå?³é??"
+msgstr[1] "%d å°?æ?ªå?³é??"
+
+#: ../modules/mail/e-mail-shell-view-private.c:878
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d å°?å·²å?³é??"
+msgstr[1] "%d å°?å·²å?³é??"
+
+#: ../modules/mail/e-mail-shell-view-private.c:890
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d å°?æ?ªè®?ï¼?"
+msgstr[1] "%d å°?æ?ªè®?ï¼?"
+
+#: ../modules/mail/e-mail-shell-view-private.c:893
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "å?± %d å°?"
+msgstr[1] "å?± %d å°?"
+
+#: ../modules/mail/e-mail-shell-view.c:524
+msgid "Proxy _Logout"
+msgstr "ç?»å?ºä»£ç??ä¼ºæ??å?¨(_L)"
+
+#: ../modules/mail/em-composer-prefs.c:473
+msgid "Language(s)"
+msgstr "èª?è¨?"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "æ¯?æ¬¡"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "æ¯?å¤©ä¸?æ¬¡"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "æ¯?é?±ä¸?æ¬¡"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "æ¯?æ??ä¸?æ¬¡"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "å? å?¥è?ªè¨?å??å?¾é?µä»¶æª?é "
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "æ¨?é å??ç¨±:"
+
+#: ../modules/mail/em-mailer-prefs.c:226
+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
+msgid "Header"
+msgstr "é ?é¦?"
+
+#: ../modules/mail/em-mailer-prefs.c:329
+msgid "Contains Value"
+msgstr "å??å?«æ?¸å?¼"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#, 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
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?ä½¿ç?¨ã??è«?æª¢æ?¥æ?¯å?¦æ??å®?è£?è©²å¥?ä»¶ã??"
+
+#: ../modules/mail/em-mailer-prefs.c:766
+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
+msgid "_Date header:"
+msgstr "æ?¥æ??æ¨?é (_D):"
+
+#: ../modules/mail/em-mailer-prefs.c:1154
+msgid "Show _original header value"
+msgstr "é¡¯ç¤ºå??å§?æ¨?é æ?¸å?¼(_O)"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Python å¤?æ??ç¨?å¼?è¼?å?¥ç¨?å¼?æ¸¬è©¦"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python æ¸¬è©¦å¤?æ??ç¨?å¼?"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python EPlugin è¼?å?¥ç¨?å¼?ç??æ¸¬è©¦å¤?æ??ç¨?å¼?ã??"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
@@ -14660,74 +15639,80 @@ msgid "Local Address Books"
 msgstr "æ?¬å?°ç«¯é??è¨?é??"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "List of clues for the attachment reminder plugin to look for in a message body"
-msgstr "è®?é??å? æª?æ¡?æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå?æ¸?å?®"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"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 "è®?é??å? æª?æ¡?æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå?æ¸?å?®ã??"
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr "è®?é??ä»¶æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå?æ¸?å?®ã??"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:389
+#: ../plugins/attachment-reminder/attachment-reminder.c:514
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "é??é?µå?"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Attachment Reminder"
-msgstr "é??å? æª?æ¡?æ??é??ç¨?å¼?"
-
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr "ç?¶æ?¨å¿?è¨?å°?é??ä»¶å? å?¥é?µä»¶æ??æ??é??æ?¨ã??"
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr "Evolution å·²æ?¾å?°æ??äº?ä»£è¡¨è©²é?µä»¶æ??å?«æ??é??ä»¶ç??é??é?µå?ï¼?å?»æ?¾ä¸?å?°é??å??é??ä»¶ã??"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
-msgstr "Evolution å·²æ?¾å?°æ??äº?ä»£è¡¨è©²é?µä»¶æ??å?«æ??é??å? æª?æ¡?ç??é??é?µå?ï¼?å?»æ?¾ä¸?å?°é??å??é??å? æª?æ¡?ã??"
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
-msgstr "é?µä»¶æ²?æ??é??å? æª?æ¡?"
+msgstr "é?µä»¶æ²?æ??é??ä»¶"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
 msgstr "æ?°å¢?é??ä»¶(_A)..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "ç·¨è¼¯é?µä»¶(_E)"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "é??ä»¶æ??é??ç¨?å¼?"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "ç?¶æ?¨å¿?è¨?å°?é??ä»¶å? å?¥é?µä»¶æ??æ??é??æ?¨ã??"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Audio Inline"
+msgid "Inline Audio"
 msgstr "è¡?å?§é?³æ??"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly from Evolution."
-msgstr "å¾? Evolution ç?´æ?¥æ?æ?¾é?³æ??é??ä»¶ã??"
+msgid "Play audio attachments directly in mail messages."
+msgstr "ç?´æ?¥æ?æ?¾é?µä»¶ä¸ç??é?³æ??é??ä»¶ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "é?¸æ?? Evolution å??ä»½æª?æ¡?ç??å??ç¨±"
 
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
-msgstr "å??ä»½å¾?é??æ?°å??å?? E_volution"
+msgstr "å??ä»½å¾?é??æ?°å??å?? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:209
 msgid "Select name of the Evolution backup file to restore"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution å??ä»½æª?æ¡?å??ç¨±"
 
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
-msgstr "å??å?å¾?é??æ?°å??å?? E_volution"
-
-#: ../plugins/backup-restore/backup-restore.c:287
-msgid "Restore from backup"
-msgstr "å¾?å??ä»½é??å??"
+msgstr "é??å??å¾?é??æ?°å??å?? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:289
-msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
-msgstr "æ?¨å?¯ä»¥å¾?å??ä»½ä¸é??å?? Evolutionã??å®?å?¯ä»¥é??å??æ??æ??ç??é?µä»¶ã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??ã??é?£çµ¡äººã??å®?ä¹?å?¯ä»¥é??å??æ?¨æ??æ??ç??å??äººè¨å®?ã??é?µä»¶é??æ¿¾å?¨ç?ã??"
+#: ../plugins/backup-restore/backup-restore.c:290
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
+msgstr ""
+"æ?¨å?¯ä»¥å¾?å??ä»½ä¸é??å?? Evolutionã??å®?å?¯ä»¥é??å??æ??æ??ç??é?µä»¶ã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??ã??é?£"
+"çµ¡äººã??å®?ä¹?å?¯ä»¥é??å??æ?¨æ??æ??ç??å??äººè¨å®?ã??é?µä»¶é??æ¿¾å?¨ç?ã??"
 
 #: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
@@ -14741,13 +15726,33 @@ msgstr "é?¸æ??è¦?é??å??ç?? Evolution æª?æ¡?åº«ï¼?"
 msgid "Choose a file to restore"
 msgstr "é?¸æ??è¦?é??å??ç??æª?æ¡?"
 
+#: ../plugins/backup-restore/backup-restore.c:315
+msgid "Restore from backup"
+msgstr "å¾?å??ä»½é??å??"
+
+#: ../plugins/backup-restore/backup-restore.c:353
+msgid "_Backup Settings..."
+msgstr "å??ä»½è¨å®?å?¼(_B)..."
+
+#: ../plugins/backup-restore/backup-restore.c:355
+msgid "Backup Evolution data and settings to an archive file"
+msgstr "å°? Evolution ç??è³?æ??è??è¨å®?å?¼å??ä»½ç?ºæª?æ¡?åº«"
+
+#: ../plugins/backup-restore/backup-restore.c:360
+msgid "R_estore Settings..."
+msgstr "é??å??è¨å®?å?¼(_E)..."
+
+#: ../plugins/backup-restore/backup-restore.c:362
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "å¾?æª?æ¡?åº«é??å?? Evolution ç??è³?æ??è??è¨å®?å?¼"
+
 #: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "å??ä»½ Evolution ç?®é??"
 
 #: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
-msgstr "å??å? Evolution ç?®é??"
+msgstr "é??å?? Evolution ç?®é??"
 
 #: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
@@ -14804,42 +15809,42 @@ msgstr "ç§»é?¤æ?«å?ç??å??ä»½æª?æ¡?"
 msgid "Ensuring local sources"
 msgstr "æ£å?¨ç¢ºèª?æ?¬å?°ç«¯ä¾?æº?"
 
-#: ../plugins/backup-restore/backup.c:429
+#: ../plugins/backup-restore/backup.c:427
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ£å??ä»½è?³è³?æ??å¤¾ %s"
 
-#: ../plugins/backup-restore/backup.c:434
+#: ../plugins/backup-restore/backup.c:432
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "å¾?è³?æ??å¤¾é??å?? %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Backup"
 msgstr "Evolution å??ä»½"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Restore"
 msgstr "Evolution é??å??"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:487
 msgid "Backing up Evolution Data"
 msgstr "å??ä»½ Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:488
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å?¨ Evolution å??ä»½æ?¨ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:490
 msgid "Restoring Evolution Data"
 msgstr "é??å?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:491
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å?¨ Evolution é??å??æ?¨ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:511
+#: ../plugins/backup-restore/backup.c:509
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "é??å??å??ä½?æ??è?±ç??æ??é??å??æ±ºæ?¼æ?¨ç??å¸³è??ä¸è³?æ??ç??å¤?å¯¡ã??"
 
@@ -14857,12 +15862,19 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "ç¢ºå®?è¦?é??é?? Evolutionï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "ç¢ºå®?è¦?å¾?é?¸å®?ç??å??ä»½æª?æ¡?é??å?? Evolutionï¼?"
 
 #: ../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 "Evolution å??ä»½å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å?¨é?²è¡?ä¹?å??è«?ç¢ºå®?æ?¨å·²å?²å?ä¸¦é??é??æ??æ??æ?ªå?²å?ç??è¦?çª?ã??å¦?æ??å¸?æ?? Evolution å?¨å??ä»½å¾?è?ªå??é??æ?°å??å??ï¼?è«?å??ç?¨å??æ??æ??é??ã??"
+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 ""
+"Evolution å??ä»½å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å?¨é?²è¡?ä¹?å??è«?ç¢ºå®?æ?¨å·²å?²å?ä¸¦é??é??"
+"æ??æ??æ?ªå?²å?ç??è¦?çª?ã??å¦?æ??å¸?æ?? Evolution å?¨å??ä»½å¾?è?ªå??é??æ?°å??å??ï¼?è«?å??ç?¨å??æ??æ??é??ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
@@ -14881,51 +15893,46 @@ msgid "The selected folder is not writable."
 msgstr "é?¸å??ç??è³?æ??å¤¾ç?¡æ³?å¯«å?¥ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-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."
-msgstr "é??å°?æ??å?ªé?¤æ??æ?? Evolution ç?®å??ç??è³?æ??è??è¨å®?å?¼ä¸¦å¾?å??ä»½ä¸é??å??å®?å??ã??Evolution é??å??å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å¦?æ??å¸?æ?? Evolution å?¨é??å??å¾?è?ªå??é??æ?°å??å??ï¼?è«?å??ç?¨å??æ??æ??é??ã??"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr "å??ä»½è??å??å? Evolution ç??è³?æ??è??è¨å®?å?¼"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "é??å??è¨å®?å?¼(_E)..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "å??ä»½è¨å®?å?¼(_B)..."
+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."
+msgstr ""
+"é??å°?æ??å?ªé?¤æ??æ?? Evolution ç?®å??ç??è³?æ??è??è¨å®?å?¼ä¸¦å¾?å??ä»½ä¸é??å??å®?å??ã??Evolution é??å??"
+"å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å¦?æ??å¸?æ?? Evolution å?¨é??å??å¾?è?ªå??é??æ?°å??å??ï¼?è«?"
+"å??ç?¨å??æ??æ??é??ã??"
 
-#: ../plugins/bbdb/bbdb.c:622
-#: ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "è?ªå??å? å?¥ç??é?£çµ¡äºº"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:646
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "å?¨å?³é??é?µä»¶æ??è?ªå??å»ºç«?é??è¨?é??é ?ç?®(_A)"
 
-#: ../plugins/bbdb/bbdb.c:652
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "é?¸æ??çµ¦è?ªå??å? å?¥é?£çµ¡äººç?¨ç??é??è¨?é??"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "å?³æ??è¨?æ?¯é?£çµ¡äºº"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:746
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "å®?æ??å¾? Pidgin ç??å¥½å??æ¸?å?®å??æ¥é?£çµ¡äººè³?è¨?å??å??ç??"
 
-#: ../plugins/bbdb/bbdb.c:688
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "é?¸æ??çµ¦ Pidgin å¥½å??å??å?®ç?¨ç??é??è¨?é??"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "ç«?å?³è??å¥½å??æ¸?å?®å??æ¥(_B)"
 
@@ -14937,34 +15944,42 @@ msgstr "BBDB"
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 "ä¸?ç?¨å??å¤§è²»å?¨ç« ç®¡ç??æ?¨ç??é??è¨?é??äº?ã??\n"
 "\n"
-"å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??ä¸å¡«å?¥å§?å??è??é?»å?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸å¡«å?¥ IM é?£çµ¡äººè³?è¨?ã??"
+"å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??ä¸å¡«å?¥å§?å??è??é?»å?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸å¡«å?¥ IM "
+"é?£çµ¡äººè³?è¨?ã??"
 
-#. 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:158
 #, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr "Bogofilter å°?æ?ªå??å¦¥ã??è«?å??å®?è£?å®?ã??"
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "å?¨ç?¢ç?? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter å?ç¨?åº?æ²?æ??å??æ??ï¼?ä¸æ¢å®?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ç?å¾? Bogofilter å?ç¨?åº?ä¸æ?·ï¼?çµ?çµ?å®?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "å°?ç®¡è?³ Bogofilter å¤±æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%dã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "å°?é?µä»¶æ??å?è½?æ??ç?º _Unicode"
 
@@ -14973,7 +15988,9 @@ msgid "Convert mail messages to Unicode"
 msgstr "å°?é?µä»¶è½?æ??ç?º Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
 msgstr "å°?é?µä»¶æ??å?è½?æ??ç?º Unicode UTF-8 ä»¥çµ±ä¸?ä¾?è?ªä¸?å??å?é??ç?? spam/ham ç?¹å¾µã??"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -14988,39 +16005,133 @@ msgstr "Bogofilter é?¸é ?"
 msgid "Filter junk messages using Bogofilter."
 msgstr "ä½¿ç?¨ Bogofilter é??æ¿¾å??å?¾é?µä»¶ã??"
 
-#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-browse-server.c:198
+msgid "Authentication failed. Server requires correct login."
+msgstr "é©?è?å¤±æ??ã??ä¼ºæ??å?¨è¦?æ±?æ£ç¢ºç??ç?»å?¥ã??"
+
+#: ../plugins/caldav/caldav-browse-server.c:200
+msgid "Given URL cannot be found."
+msgstr "æ?¾ä¸?å?°æ??å®?ç?? URLã??"
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+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
+msgid "Failed to parse server response."
+msgstr "ç?¡æ³?å??æ??ä¼ºæ??å?¨ç??å??æ??ã??"
+
+#: ../plugins/caldav/caldav-browse-server.c:428
+msgid "Events"
+msgstr "äº?ä»¶"
+
+#: ../plugins/caldav/caldav-browse-server.c:450
+msgid "User's calendars"
+msgstr "ä½¿ç?¨è??ç??è¡?äº?æ??"
+
+#: ../plugins/caldav/caldav-browse-server.c:558
+#: ../plugins/caldav/caldav-browse-server.c:629
+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
+msgid "Searching for user's calendars..."
+msgstr "æ£å?¨æ??å°?ä½¿ç?¨è??ç??è¡?äº?æ??..."
+
+#: ../plugins/caldav/caldav-browse-server.c:666
+msgid "Could not find any user calendar."
+msgstr "æ?¾ä¸?å?°ä»»ä½?ä½¿ç?¨è??è¡?äº?æ??ã??"
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr "å??ä¸?æ¬¡ç??å??è©¦å¤±æ??ï¼?%s"
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr "å??ä¸?æ¬¡ç??å??è©¦å¤±æ??ä»£ç¢¼ç?º %d"
+
+#: ../plugins/caldav/caldav-browse-server.c:799
+#, c-format
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr "è¼¸å?¥ä½¿ç?¨è?? <b>%s</b> å?¨ä¼ºæ??å?¨ <b>%s</b> ä¸?ç??å¯?ç¢¼ "
+
+#: ../plugins/caldav/caldav-browse-server.c:856
+#, fuzzy, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+"ä¸?è?½å»ºç«?è¼¸å?ºæª?æ¡?ï¼?%sï¼?\n"
+" %s"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1091
+msgid "Searching folder content..."
+msgstr "æ??å°?è³?æ??å¤¾å?§å®¹..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1134
+msgid "List of available calendars:"
+msgstr "å?¯ç?¨ç??è¡?äº?æ??ç??æ¸?å?®ï¼?"
+
+#: ../plugins/caldav/caldav-browse-server.c:1171
+msgid "Supports"
+msgstr "æ?¯æ?´"
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, c-format
+msgid "Failed to create thread: %s"
+msgstr "ç?¡æ³?å»ºç«?å?·è¡?ç·?ï¼?%s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr "ä¼ºæ??å?¨ URLã??%sã??ä¸?æ?¯æ??æ??ç?? URL"
+
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr "ç??è¦½ CalDAV è¡?äº?æ??"
+
+#: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/caldav/caldav-source.c:402
 #: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "ç¶²å??(_U):"
 
-#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/caldav/caldav-source.c:426
 #: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "ä½¿ç?¨ _SSL"
 
+#: ../plugins/caldav/caldav-source.c:468
+msgid "Brows_e server for a calendar"
+msgstr "ç??è¦½ä¼ºæ??å?¨ç??è¡?äº?æ??(_E)"
+
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/caldav/caldav-source.c:480
 #: ../plugins/calendar-file/calendar-file.c:274
 #: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/calendar-weather/calendar-weather.c:501
 #: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/google-account-setup/google-source.c:717
 msgid "Re_fresh:"
 msgstr "é??æ?°æ?´ç??(_F):"
 
-#: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:743
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-msgid "weeks"
-msgstr "é?±"
-
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
 msgstr "å? å?¥ Evolution å°? CalDAV ç??æ?¯æ?´ã??"
@@ -15081,55 +16192,62 @@ msgstr "å°?ç¶²è·¯è¡?äº?æ??å? å?¥ Evolutionã??"
 msgid "Web Calendars"
 msgstr "ç¶²è·¯è¡?äº?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "å¤©æ°£ï¼?èµ·é?§"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "å¤©æ°£ï¼?å¤?é?²"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "å¤©æ°£ï¼?å¤?é?²ç??å¤?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "å¤©æ°£ï¼?å¤?é?²"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "å¤©æ°£ï¼?é?£é?¨"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "å¤©æ°£ï¼?ä¸?é?ª"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "å¤©æ°£ï¼?è?·é?½"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "å¤©æ°£ï¼?æ?´æ??ç??å¤?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "å¤©æ°£ï¼?é?·æ?´"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "é?¸æ??ä¸?å??ä½?ç½®"
 
-#: ../plugins/calendar-weather/calendar-weather.c:606
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:379
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../plugins/calendar-weather/calendar-weather.c:599
 msgid "_Units:"
 msgstr "å?®ä½?(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:613
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å?¬å??ç?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:614
+#: ../plugins/calendar-weather/calendar-weather.c:607
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(è?¯æ°?ã??å?¬å??ç?)"
 
@@ -15141,20 +16259,30 @@ msgstr "å? å?¥ Evolution å°?å¤©æ°£è¡?äº?æ??ç??æ?¯æ?´ã??"
 msgid "Weather Calendars"
 msgstr "æ°£è±¡è¡?äº?æ??"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid "Copy Tool"
-msgstr "è¤?è£½å·¥å?·"
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+msgid "Contacts map"
+msgstr "é?£çµ¡äººå?°å??"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy things to the clipboard."
-msgstr "å°?å?§å®¹è¤?è£½å?°å?ªè²¼ç°¿ã??"
+#: ../plugins/contacts-map/contacts-map.c:56
+msgid "Show a map of all the contacts"
+msgstr "é¡¯ç¤ºæ??æ??é?£çµ¡äººç??å?°å??"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr "å?¨å?¯ä»¥ç??æ??å??å? å?¥ä¸?å¼µå?°å??ä¾?é¡¯ç¤ºé?£çµ¡äººç??ä½?ç½®ã??"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+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 "æª¢æ?¥ Evolution æ?¯å?¦ç?ºé ?è¨ç??é?µä»¶ç¨?å¼?"
 
 #: ../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."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "æ¯?æ¬¡å??å?? Evolution æ??ï¼?æª¢æ?¥å®?æ?¯å?¦ç?ºé ?è¨ç??é?µä»¶ç¨?å¼?ã??"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
@@ -15169,24 +16297,23 @@ msgstr "é ?è¨é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "æ?¨æ?¯å?¦è¦?å°? Evolution è¨ç?ºæ?¨ç??é ?è¨é?»å?é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?ï¼?"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:627
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../plugins/default-source/default-source.c:80
+#: ../plugins/default-source/default-source.c:94
 msgid "Mark as _default address book"
 msgstr "æ¨?ç¤ºç?ºé ?è¨é??è¨?é??(_D)"
 
-#: ../plugins/default-source/default-source.c:101
+#: ../plugins/default-source/default-source.c:119
+msgid "A_utocomplete with this address book"
+msgstr "ç?¨é??å??é??è¨?é??é?²è¡?è?ªå??å®?æ??(_U)"
+
+#: ../plugins/default-source/default-source.c:138
 msgid "Mark as _default calendar"
 msgstr "æ¨?ç¤ºç?ºé ?è¨è¡?äº?æ??(_D)"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:139
 msgid "Mark as _default task list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å·¥ä½?æ¸?å?®(_D)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:140
 msgid "Mark as _default memo list"
 msgstr "æ¨?ç¤ºç?ºé ?è¨å??å¿?é??æ¸?å?®(_D)"
 
@@ -15198,41 +16325,53 @@ msgstr "é ?è¨ä¾?æº?"
 msgid "Mark your preferred address book and calendar as default."
 msgstr "å°?æ?¨å??å¥½ç??é??è¨?é??å??è¡?äº?æ??æ¨?è¨?ç?ºé ?è¨ã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:333
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "è?ªè¨?æ¨?é ç??æ¸?å?®"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"é??å??é?µå?¼æ??å®?ç??æ?¯æ?¨å?¯ä»¥å? å?°å¤?å¯?é?µä»¶ç??è?ªè¨?æ¨?é æ¸?å?®ã??æ??å®?æ¨?é è??æ¨?é æ?¸å?¼ç??æ ¼å¼?"
+"ç?ºï¼?è?ªè¨?æ¨?é å??ç¨±å? ä¸?ã??=ã??ï¼?å¾?é?¢ç??æ?¸å?¼å??ä»¥ã??;ã??é??é??"
+
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "å®?å?¨æ?§:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "æ?ªæ¸é¡?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "å·²ä¿?è·"
 
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Secret"
 msgstr "å¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Top secret"
 msgstr "æ¥µæ©?å¯?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "è?ªè¨?æ¨?é (_C)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:906
-msgid "Key"
-msgstr "è¨å®?é?µ"
-
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:395
-msgid "Values"
-msgstr "æ?¸å?¼"
-
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -15240,9 +16379,14 @@ msgstr ""
 "æ??å®?è?ªè¨?æ¨?é é?µå?¼ç??æ ¼å¼?ï¼?\n"
 "è?ªè¨?æ¨?é é?µå?¼ç??å??ç¨±è«?ä»¥ã??;ã??é??é??ã??"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "é?»å?é?µä»¶è?ªè¨?æ¨?é "
+#: ../plugins/email-custom-header/email-custom-header.c:948
+msgid "Key"
+msgstr "è¨å®?é?µ"
+
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+msgstr "æ?¸å?¼"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
@@ -15253,927 +16397,16 @@ msgstr "å?¨å¤?å¯?é?µä»¶ä¸å? å?¥è?ªè¨?æ¨?é ã??"
 msgid "Custom Header"
 msgstr "è?ªè¨?æ¨?é "
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "è?ªè¨?æ¨?é ç??æ¸?å?®"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
-msgstr "é??å??é?µå?¼æ??å®?ç??æ?¯æ?¨å?¯ä»¥å? å?°å¤?å¯?é?µä»¶ç??è?ªè¨?æ¨?é æ¸?å?®ã??æ??å®?æ¨?é è??æ¨?é æ?¸å?¼ç??æ ¼å¼?ç?ºï¼?è?ªè¨?æ¨?é å??ç¨±å? ä¸?ã??=ã??ï¼?å¾?é?¢ç??æ?¸å?¼å??ä»¥ã??;ã??é??é??"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "é??å??å?¶ä»?ä½¿ç?¨è??ç??è³?æ??å¤¾"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "å¸³è??(_A):"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "è³?æ??å¤¾å??ç¨±(_F):"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "ä½¿ç?¨è??(_U):"
-
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "å®?å?¨å¯?ç¢¼"
-
-#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
-msgstr "æ¤é?¸é ?å°?æ??é?£æ?¥å?°ä½¿ç?¨å®?å?¨å¯?ç¢¼ (NTLM) é©?è?ç?? Exchange ä¼ºæ??å?¨ã??"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "ç´?æ??å?å¯?ç¢¼"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid "This option will connect to the Exchange server using standard plaintext password authentication."
-msgstr "æ¤é?¸é ?å°?æ??é?£æ?¥å?°ä½¿ç?¨æ¨?æº?ç´?æ??å?å¯?ç¢¼é©?è?ç?? Exchange ä¼ºæ??å?¨ã??"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-msgid "Out Of Office"
-msgstr "ä¸?å?¨è¾¦å?¬å®¤"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
-msgid ""
-"The message specified below will be automatically sent to \n"
-"each person who sends mail to you while you are out of the office."
-msgstr ""
-"ä»¥ä¸?æ??å®?ç??è¨?æ?¯å°?æ??è?ªå??å?³é??çµ¦\n"
-"æ¯?ä¸?ä½?å?¨æ?¨é?¢é??è¾¦å?¬å®¤æ??å?³é??é?µä»¶çµ¦æ?¨ç??äººã??"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:290
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am out of the office"
-msgstr "æ??ç?®å??ä¸?å?¨è¾¦å?¬å®¤"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:294
-msgid "I am in the office"
-msgstr "æ??ç?®å??å?¨è¾¦å?¬å®¤"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:340
-msgid "Change the password for Exchange account"
-msgstr "æ?¹è®? Exchange å¸³è??ç??å¯?ç¢¼"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:342
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "è®?æ?´å¯?ç¢¼"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
-msgid "Manage the delegate settings for Exchange account"
-msgstr "ç®¡ç?? Exchange å¸³è??ç??æ??æ¬?è¨å®?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-msgid "Delegation Assistant"
-msgstr "å§?æ´¾è¨å®?å?©ç??"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-msgid "Miscelleneous"
-msgstr "é??é ?"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:371
-msgid "View the size of all Exchange folders"
-msgstr "æª¢è¦?æ??æ?? Exchange è³?æ??å¤¾ç??å¤§å°?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:373
-msgid "Folders Size"
-msgstr "è³?æ??å¤¾å¤§å°?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:380
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "Exchange è¨å®?å?¼"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:726
-msgid "_OWA URL:"
-msgstr "_OWA URL:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:752
-msgid "A_uthenticate"
-msgstr "é©?è?(_U)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:774
-msgid "Mailbox name is _different than user name"
-msgstr "ä¿¡ç®±å??ç¨±è??ä½¿ç?¨è??å??ç¨±ä¸?å??(_D)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:787
-msgid "_Mailbox:"
-msgstr "ä¿¡ä»¶å?£(_M):"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1001
-msgid "_Authentication Type"
-msgstr "é©?è?é¡?å??(_A)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1130
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1132
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 KB"
-
-#. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1137
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "å¤§å°?:"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution è??æ?¼é?¢ç·?æ¨¡å¼?ã??æ?¨ç?¾å?¨ä¸?è?½å»ºç«?æ??ä¿®æ?¹è³?æ??å¤¾ã??\n"
-"è«?å??æ??å?°ä¸?ç·?æ¨¡å¼?ä»¥é?²è¡?é??é¡?æ??ä½?ã??"
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid "The current password does not match the existing password for your account. Please enter the correct password"
-msgstr "ç?®å??ç??å¯?ç¢¼ä¸?ç¬¦å??å¸³è??ç??ç?¾å?å¯?ç¢¼ã??è«?è¼¸å?¥æ£ç¢ºç??å¯?ç¢¼"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "é??å?©å??å¯?ç¢¼ä¸?ä¸?æ¨£ã??è«?é??æ?°è¼¸å?¥å¯?ç¢¼ã??"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "ç¢ºèª?å¯?ç¢¼ï¼?"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "ç?®å??ç??å¯?ç¢¼ï¼?"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "æ?°å¯?ç¢¼ï¼?"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "ç?®å??ç??å¯?ç¢¼å·²é??æ??ã??è«?ç«?å?³è®?æ?´å¯?ç¢¼ã??"
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:657
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "æ?¨ç??å¯?ç¢¼å°?å?¨ %d å¤©å¾?å?°æ??"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:142
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
-msgid "Custom"
-msgstr "è?ªè¨?"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:168
-msgid "Editor (read, create, edit)"
-msgstr "ç·¨è¼¯è?? (è®?å??ã??å»ºç«?ã??ç·¨è¼¯)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:172
-msgid "Author (read, create)"
-msgstr "å??è??è?? (è®?å??ï¼?å»ºç«?)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:176
-msgid "Reviewer (read-only)"
-msgstr "æª¢é?±è?? (å??é??è®?å??)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:225
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Delegate Permissions"
-msgstr "ä»£ç??äººæ¬?é??"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:236
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
-#, c-format
-msgid "Permissions for %s"
-msgstr "%s ç??æ¬?é??"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:326
-msgid "This message was sent automatically by Evolution to inform you that you have been designated as a delegate. You can now send messages on my behalf."
-msgstr "é??å°?é?µä»¶æ?¯ç?± Evolution è?ªå??å¯?å?ºä»¥é??ç?¥æ?¨å·²ç¶?è¢«æ??æ´¾ç?ºä»£ç??äººã??æ?¨ç?¾å?¨å?¯ä»¥ä»£è¡¨æ??å¯?ç?¼é?µä»¶ã??"
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:331
-msgid "You have been given the following permissions on my folders:"
-msgstr "æ?¨å·²ç¶?å¾?å?°æ??ç??è³?æ??å¤¾ç??æ¬?é??æ??ï¼?"
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:351
-msgid "You are also permitted to see my private items."
-msgstr "æ?¨ä¹?è¢«å??è¨±æ?¥ç??æ??ç??ç§?äººé ?ç?®ã??"
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
-msgid "However you are not permitted to see my private items."
-msgstr "ç?¶è??æ?¨ä¸¦æ?ªå¾?å?°å??è¨±è§?ç??æ??ç??ç§?äººé ?ç?®ã??"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:390
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "æ?¨å·²ç¶?è¢«æ??æ´¾ç?º %s ç??ä»£ç??äºº"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:416
-msgid "Delegate To"
-msgstr "å§?è¨?çµ¦"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:581
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "è¦?ç§»é?¤ä»£ç??äºº %s å??ï¼?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:698
-msgid "Could not access Active Directory"
-msgstr "ç?¡æ³?å?å?? Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:710
-msgid "Could not find self in Active Directory"
-msgstr "Active Directory ä¸æ?¾ä¸?å?°è?ªå·±"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:723
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "Active Directory ä¸æ?¾ä¸?å?°ä»£ç??äºº %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:735
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "ç?¡æ³?ç§»é?¤ä»£ç??äºº %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:795
-msgid "Could not update list of delegates."
-msgstr "ç?¡æ³?æ?´æ?°ä»£ç??äººç??æ¸?å?®ã??"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:813
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "ç?¡æ³?æ?°å¢?ä»£ç??äºº %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:980
-msgid "Error reading delegates list."
-msgstr "è®?å??ä»£ç??äººæ¸?å?®é?¯èª¤ã??"
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-msgid "C_alendar:"
-msgstr "è¡?äº?æ??(_A):"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Co_ntacts:"
-msgstr "é?£çµ¡äºº(_N):"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegates"
-msgstr "ä»£ç??äºº"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid ""
-"None\n"
-"Reviewer (read-only)\n"
-"Author (read, create)\n"
-"Editor (read, create, edit)"
-msgstr ""
-"æ²?æ??\n"
-"æª¢é?±è?? (å??é??è®?å??)\n"
-"å??è??è?? (è®?å??ï¼?å»ºç«?)\n"
-"ç·¨è¼¯è?? (è®?å??ã??å»ºç«?ã??ç·¨è¼¯)"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Permissions for"
-msgstr "æ¬?é??æ??äº?"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-msgstr ""
-"é??é??æ?¨çµ¦äº?é??äº?ä½¿ç?¨è??ç??æ¬?é??ï¼?ä»?å??å°?å?¯ä»¥ä»¥æ?¨ç??èº«å??å?³é??é?µä»¶ï¼?\n"
-"ä¸¦å?å??æ?¨ç??è³?æ??å¤¾ã??"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "ä»£ç??äººå?¯ä»¥æ?¥ç??ç§?äººç??é ?ç?®(_D)"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "æ?¶ä»¶å?£(_I):"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "æ¬?é??æ??è¦?(_S)"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks:"
-msgstr "å·¥ä½?(_T):"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "æ¬?é??..."
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "è³?æ??å¤¾å??ç¨±"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "è³?æ??å¤¾å¤§å°?"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-msgid "User"
-msgstr "ä½¿ç?¨è??"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??è³?æ??å¤¾"
-
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "Exchange è³?æ??å¤¾æ¨¹"
-
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:233
-#: ../plugins/exchange-operations/exchange-folder.c:243
-msgid "Unsubscribe Folder..."
-msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:518
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "ç¢ºå®?è¦?å??æ¶?è¨?é?±è³?æ??å¤¾ã??%sã??ï¼?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:530
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "å??æ¶?è¨?é?±ã??%sã??"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>ç?®å??æ?¨ç??ç??æ??æ?¯ã??ä¸?å?¨è¾¦å?¬å®¤ã??ã??</b>\n"
-"\n"
-"æ?¨è¦?è®?æ?´ç??æ??ç?ºã??å?¨è¾¦å?¬å®¤ã??å??ï¼? "
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>ã??ä¸?å?¨è¾¦å?¬å®¤ã??è¨?æ?¯ï¼?</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>ç??æ??ï¼?</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>ç?¶æ?¨ä¸?å?¨è¾¦å?¬å®¤æ??ï¼?ä»»ä½?å?³é??é?µä»¶çµ¦æ?¨ç??äººé?½æ??æ?¶å?°\n"
-"ä»¥ä¸?æ??å®?ç??è¨?æ?¯ã??</small>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "æ??ç?®å??å?¨è¾¦å?¬å®¤"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "æ??ç?®å??ä¸?å?¨è¾¦å?¬å®¤"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "å?¦ï¼?è«?ä¸?è¦?è®?æ?´ç??æ??"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "å¤?å?ºå?©ç??"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "æ?¯ï¼?è«?è®?æ?´ç??æ??"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "å¯?ç¢¼å?°æ??è¦ç¤º..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "æ?¨ç??å¯?ç¢¼å°?å?¨ 7 å¤©å?§å?°æ??..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "è®?æ?´å¯?ç¢¼(_D)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
-msgid "(Permission denied.)"
-msgstr "(æ¬?é??è¢«æ??çµ?ã??)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-msgid "Add User:"
-msgstr "æ?°å¢?ä½¿ç?¨è??ï¼?"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:932
-#: ../plugins/groupwise-features/share-folder.c:713
-msgid "Add User"
-msgstr "å? å?¥ä½¿ç?¨è??"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>æ¬?é??</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "ç?¡æ³?å?ªé?¤"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "ç?¡æ³?ç·¨è¼¯"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "å»ºç«?é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "å»ºç«?å?è³?æ??å¤¾"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "å?ªé?¤ä»»ä½?é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "å?ªé?¤è?ªå·±ç??é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "ç·¨è¼¯ä»»ä½?é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "ç·¨è¼¯è?ªå·±ç??é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "è³?æ??å¤¾é?£çµ¡äºº"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "è³?æ??å¤¾æ??æ??è??"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "è³?æ??å¤¾é¡¯ç¤º"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "è®?å??é ?ç?®"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "è§?è?²: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>é?µä»¶è¨å®?å?¼</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>è¿½è¹¤é?¸é ?</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "Exchange - å?³é??é?¸é ?"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "é??è¦?æ?§(_M):"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"ä¸?è?¬\n"
-"é«?\n"
-"ä½?"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"ä¸?è?¬\n"
-"å??äºº\n"
-"ç§?äºº\n"
-"æ©?å¯?"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "è¦?æ±?é??å°?é?µä»¶ç´¢å??é??é??å??æ¢?(_D)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "è¦?æ±?é??å°?é?µä»¶ç´¢å??è®?ä¿¡å??æ¢?(_R)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "ä»¥ä»£ç??äººèº«å??å¯?ä¿¡"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "æ??æ??åº¦(_S):"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "ä½¿ç?¨è??(_U)"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:134
-msgid "Select User"
-msgstr "é?¸æ??ä½¿ç?¨è??"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:172
-msgid "Address Book..."
-msgstr "é??è¨?é??..."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??é?£çµ¡äºº"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??è¡?äº?æ??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "Activates the Evolution-Exchange extension package."
-msgstr "ä½¿ç?¨ Evolution-Exchange å»¶ä¼¸å¥?ä»¶ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "Exchange æ??ä½?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ä¸?è?½å?å??ã??Exchange è¨å®?å?¼ã??å??é ?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr "å? çµ?æ??å??é¡?è??ç?¡æ³?è®?æ?´å¯?ç¢¼ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "ç?¡æ³?é¡¯ç¤ºè³?æ??å¤¾ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "ç?¡æ³?å?·è¡?æ¤é ?æ??ä½?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid "Changes to options for Exchange account \"{0}\" will only take effect after restarting Evolution."
-msgstr "å°? Exchange å¸³è??ã??{0}ã??é?¸é ?ç??è®?æ?´å°?å?¨é??æ?°å??å?? Evolution ä¹?å¾?ç??æ??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "ç?¡æ³?é©?è?ä¼ºæ??å?¨ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "ç?¡æ³?è®?æ?´å¯?ç¢¼ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"ç?¡æ³?è¨å®? Exchange å¸³è??ï¼?å? ç?ºç?¼ç??äº?\n"
-"æ?ªç?¥ç??é?¯èª¤ã??è«?æª¢æ?¥ URLã??ä½¿ç?¨è??å??ç¨±\n"
-"ä»¥å??å¯?ç¢¼ï¼?ç?¶å¾?å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "ç?¡æ³?é?£æ?¥ Exchange ä¼ºæ??å?¨ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "ç?¡æ³?é?£ç·?å?°ä¼ºæ??å?¨ {0}ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "ç?¡æ³?æ±ºå®?å§?æ´¾ç??è³?æ??å¤¾æ¬?é??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "æ?¾ä¸?å?° Exchange ç¶²é ?å?²å?ç³»çµ±ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "ç?¡æ³?å®?ä½?ä¼ºæ??å?¨ {0}ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "ç?¡æ³?å°? {0} è¨ç?ºä»£ç??äºº"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "ç?¡æ³?è®?å??è³?æ??å¤¾æ¬?é??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "ç?¡æ³?è®?å??è³?æ??å¤¾æ¬?é??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "ç?¡æ³?è®?å??ã??ä¸?å?¨è¾¦å?¬å®¤ã??ç??æ??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "ç?¡æ³?æ?´æ?°è³?æ??å¤¾æ¬?é??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "ç?¡æ³?æ?´æ?°ã??ä¸?å?¨è¾¦å?¬å®¤ã??ç??æ??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr "Evolution è¦?æ±?é??æ?°å??å??ä»¥è¼?å?¥è¨?é?±ä½¿ç?¨è??ç??é?µä»¶ç®±"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "Exchange å¸³è??å·²é?¢ç·?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-msgid ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
-msgstr ""
-"Exchange Connector é??è¦?å?å?? Exchange \n"
-"ä¼ºæ??å?¨ä¸?ç??æ??äº?å??è?½ï¼?ä½?é??äº?å??è?½å·²é??é??\n"
-"æ??å·²å°?é??ã??(é??é??å¸¸ä¸?æ?¯å?»æ??ç??ã??)æ?¨ç?? \n"
-"Exchange ç®¡ç??å?¡å°?é??è¦?é??å??æ¤å??è?½ï¼? \n"
-"è®?æ?¨å?¯ä»¥ä½¿ç?¨ \n"
-"Evolution Exchange Connectorã??\n"
-"\n"
-"è?¥é??æ??é??æ??ä¾?çµ¦æ?¨ç?? Exchange ç®¡ç??å?¡\n"
-"ç??è³?è¨?ï¼?è«?ä¾?ç?§ä¸?å??é?£çµ?ï¼?\n"
-"\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "ç?¡æ³?æ?´æ?°å§?æ´¾ï¼?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "è³?æ??å¤¾å·²å?å?¨"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "è³?æ??å¤¾ä¸?å?å?¨"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "è³?æ??å¤¾é?¢ç·?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1259
-msgid "Generic error"
-msgstr "ä¸?è?¬é?¯èª¤"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "ç?¡æ³?é?£æ?¥å?¨å??å??é??ä¼ºæ??å?¨"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
-msgstr "å¦?æ?? OWA å?¨å?¥ç??è·¯å¾?å?·è¡?ï¼?æ?¨å¿?é ?å?¨å¸³è??çµ?æ??å°?è©±ç??ä¸æ??å®?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "{0} ç??é?µä»¶ç®±ä¸¦ä¸?å?¨æ¤ä¼ºæ??å?¨ä¸?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "è«?ç¢ºå®? URL æ?¯æ£ç¢ºç??ï¼?ç?¶å¾?å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr "è«?ç¢ºå®?ä¼ºæ??å?¨å??ç¨±ç??æ?¼å?æ?¯æ£ç¢ºç??ï¼?ç?¶å¾?å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr "è«?ç¢ºå®?ä½¿ç?¨è??å??ç¨±å??å¯?ç¢¼æ?¯æ£ç¢ºç??ï¼?ç?¶å¾?å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "æ²?æ??ç?ºæ¤å¸³è??è¨å®?ã??å?¨å??å??é??ã??ä¼ºæ??å?¨ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "å?¨ {1} ä¸?æ²?æ??ä½¿ç?¨è?? {0} ç??é?µä»¶ç®±ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "æ?¥ç?¡æ¤ä½¿ç?¨è?? {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "å¯?ç¢¼å·²æ??å??ç??è®?æ?´ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr "è«?è¼¸å?¥ä»£ç??äººç?? ID æ??å??æ¶?ã??ä»¥ä»£ç??äººèº«å??å¯?ä¿¡ã??é?¸é ?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "è«?ç¢ºå®?å?¨å??å??é??ä¼ºæ??å?¨å??ç¨±æ?¯æ£ç¢ºç??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "è«?é??æ?°å??å?? Evolution ä»¥ä½¿è®?æ?´ç??æ??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "è«?é?¸å??ä¸?å??ä½¿ç?¨è??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "ä¼ºæ??å?¨æ??çµ?å¯?ç¢¼ï¼?å? ç?ºå®?å¤ªå®¹æ??è¢«ç ´è§£ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "Exchange å¸³è??å°?æ??å?¨æ?¨é?¢é?? Evolution æ??å??ç?¨"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "Exchange å¸³è??å°?æ??å?¨æ?¨çµ?æ?? Evolution æ??ç§»é?¤"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "æ¤ Exchange ä¼ºæ??å?¨ç?¡æ³?è?? Exchange Connector ç?¸å®¹ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"æ¤ä¼ºæ??å?¨å?·è¡?ç??æ?¯ Exchange 5.5ã??Exchange Connector \n"
-"å??æ?¯æ?´ Microsoft Exchange 2000 å?? 2003ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-msgid ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
-msgstr ""
-"é??å?¯è?½è¡¨ç¤ºæ?¨ç??ä¼ºæ??å?¨è¦?æ±?æ?¨æ??å®?\n"
-"Windows ç¶²å??å??ç¨±ä½?ç?ºæ?¨ç??ä½¿ç?¨è??å??ç¨±\n"
-"ç??ä¸?é?¨å??(ä¾?ï¼?&quot;DOMAIN\\user&quot;)ã??\n"
-"\n"
-"æ??è??å?¯è?½å?ªæ?¯æ?¨æ??å¯?ç¢¼æ??é?¯äº?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "è«?ä½¿ç?¨ä¸?å??ç??å¯?ç¢¼å??è©¦ä¸?æ¬¡ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "ç?¡æ³?å°?ä½¿ç?¨è??å? å?¥å?å??æ?§å?¶æ¸?å?®ï¼?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "ç?¡æ³?ç·¨è¼¯å§?ä»»ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unknown error looking up {0}"
-msgstr "æ?¥è©¢ {0} æ??ç?¼ç??ä¸?æ??ç??é?¯èª¤"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:624
-#: ../plugins/mail-to-task/mail-to-task.c:599
-#: ../plugins/mail-to-task/mail-to-task.c:821
-msgid "Unknown error."
-msgstr "ä¸?æ??ç??é?¯èª¤ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "ä¸?æ??ç??é¡?å??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr "æ?¨å·²ç¶?æ?¥è¿?å?¨æ¤ä¼ºæ??å?¨å?²å?é?µä»¶ç?? quota é??é¡?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid "You are permitted to send a message on behalf of only one delegator at a time."
-msgstr "ä¸?å??ä»£ç??äººå?ªå??è¨±æ¯?æ¬¡å¯?å?ºä¸?å°?é?µä»¶ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "æ?¨ç?¡æ³?å°?è?ªå·±è¨ç?ºæ?¨è?ªå·±ç??ä»£ç??äºº"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "æ?¨å·²ç¶?è¶?é??äº?å?¨æ¤ä¼ºæ??å?¨å?²å?é?µä»¶ç?? quota é??é¡?ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "æ?¨å?¯ä»¥å?ªè¨å®?ä¸?å??å?®ä¸?ç?? Exchange å¸³è??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
-msgstr "ç?®å??ç??ä½¿ç?¨é??ç?ºï¼?{0} KBã??è«?è©¦è??å?ªé?¤ä¸?äº?é?µä»¶ä¾?ç©ºå?ºé?¨å??ç©ºé??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
-msgstr "ç?®å??ç??ä½¿ç?¨é??ç?ºï¼?{0} KBã??æ?¨ç?¾å?¨å°?ç?¡æ³?å?³é??æ??æ?¥æ?¶é?µä»¶ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
-msgstr "ç?®å??ç??ä½¿ç?¨é??ç?ºï¼?{0} KBã??é?¤é??æ?¨å?ªé?¤ä¸?äº?é?µä»¶ä¾?ç©ºå?ºé?¨å??ç©ºé??ï¼?å?¦å??å°?ç?¡æ³?å?³é??é?µä»¶ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "Your password has expired."
-msgstr "æ?¨ç??å¯?ç¢¼å·²ç¶?å?°æ??ã??"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} ç?¡æ³?å? å?¥å?å??æ?§å?¶æ¸?å?®"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} å·²ç¶?æ?¯ä¸?å??ä»£ç??äººäº?"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} å·²ç¶?å?¨æ¸?å?®ä¸"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "è¨?é?±å?¶ä»?ä½¿ç?¨è??ç??å·¥ä½?"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "æª¢æ?¥è³?æ??å¤¾æ¬?é??"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "é?»å?é?µä»¶è?ªè¨?æ¨?é "
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 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:120
+#: ../plugins/external-editor/external-editor.c:119
 msgid "Automatically launch when a new mail is edited"
 msgstr "ç?¶ç·¨è¼¯æ?°é?µä»¶æ??è?ªå??å?·è¡?"
 
@@ -16185,6 +16418,23 @@ msgstr "é ?è¨å¤?é?¨ç·¨è¼¯å?¨"
 msgid "The default command that must be used as the editor."
 msgstr "é ?è¨ç??æ??ä»¤å¿?é ?è?½å??ç?ºç·¨è¼¯å?¨ã??"
 
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "ç?¨ä¾?å??å??ç·¨è¼¯å?¨ç??æ??ä»¤: "
+
+#: ../plugins/external-editor/external-editor.c:109
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Emacs ä½¿ç?¨ã??xemacsã??\n"
+"VI ä½¿ç?¨ã??gvim -fã??"
+
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
+msgid "Compose in External Editor"
+msgstr "å?¨å¤?é?¨ç·¨è¼¯å?¨ä¸æ?°å¯«"
+
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "å¤?é?¨ç·¨è¼¯å?¨"
@@ -16202,7 +16452,9 @@ msgid "Editor not launchable"
 msgstr "ç·¨è¼¯å?¨ç?¡æ³?å??å??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
-msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
 msgstr "Evoluton ç?¡æ³?å»ºç«?ç?¨ä¾?å?²å?æ?¨é?µä»¶ç??æ?«å?æª?æ¡?ã??è«?ç¨?å¾?å??è©¦ã??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
@@ -16210,80 +16462,94 @@ msgid "External editor still running"
 msgstr "å¤?é?¨ç·¨è¼¯å?¨ä»?å?¨å?·è¡?ä¸"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
 msgstr "å¤?é?¨ç·¨è¼¯å?¨ä»?å?¨å?·è¡?ä¸ã??å?ªè¦?è©²ç·¨è¼¯å?¨ä»?å?¨ä½¿ç?¨ï¼?é?µä»¶ç·¨è¼¯å?¨è¦?çª?å°±ä¸?è?½é??é??ã??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
-msgstr "ä¸?è?½å??å??å?¨æ?¨å¤?æ??ç¨?å¼?å??å¥½è¨å®?ä¸è¨å®?ç??å¤?é?¨ç·¨è¼¯å?¨ã??è«?è©¦è??è¨å®?ä¸?å??ç??ç·¨è¼¯å?¨ã??"
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"ä¸?è?½å??å??å?¨æ?¨å¤?æ??ç¨?å¼?å??å¥½è¨å®?ä¸è¨å®?ç??å¤?é?¨ç·¨è¼¯å?¨ã??è«?è©¦è??è¨å®?ä¸?å??ç??ç·¨è¼¯å?¨ã??"
 
-#: ../plugins/external-editor/external-editor.c:109
-msgid "Command to be executed to launch the editor: "
-msgstr "ç?¨ä¾?å??å??ç·¨è¼¯å?¨ç??æ??ä»¤: "
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr "é ?è¨æ??å?¥å¤§é ç?§"
 
-#: ../plugins/external-editor/external-editor.c:110
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
 msgstr ""
-"Emacs ä½¿ç?¨ã??xemacsã??\n"
-"VI ä½¿ç?¨ã??gvim -fã??"
+"æ?¯å?¦é ?è¨å?¨å¤?å¯?é?µä»¶ä¸æ??å?¥å¤§é ç?§ã??å?¨æ ¸å??é??å??é?¸é ?ä¹?å??å¿?é ?å??è¨å®?å¥½ç?¸ç??ï¼?å?¦å??ä¸?æ??"
+"æ??ä»»ä½?æ??æ??ã??"
 
-#: ../plugins/external-editor/external-editor.c:354
-#: ../plugins/external-editor/external-editor.c:356
-msgid "Compose in External Editor"
-msgstr "å?¨å¤?é?¨ç·¨è¼¯å?¨ä¸æ?°å¯«"
+#: ../plugins/face/face.c:286
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+msgstr "é?¸æ??ä¸?å¼µ png ç?¸ç??ï¼?æ??å¥½å°?æ?¼ 700 ä½?å??çµ?ï¼?å°ºå¯¸ 48*48ï¼?"
 
-#: ../plugins/face/face.c:59
-msgid "Select a (48*48) png of size < 700bytes"
-msgstr "é?¸æ??å°?æ?¼ 700 ä½?å??çµ?ç?? (48*48) png"
+#: ../plugins/face/face.c:296
+msgid "Image files"
+msgstr "å??ç??æª?æ¡?"
 
-#: ../plugins/face/face.c:69
-msgid "PNG files"
-msgstr "PNG æª?æ¡?"
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr "é ?è¨æ??å?¥å¤§é ç?§(_I)"
 
-#: ../plugins/face/face.c:126
-msgid "_Face"
-msgstr "é?¢è²?(_F)"
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr "è¼?å?¥æ?°ç??å¤§é ç?§(_F)"
+
+#: ../plugins/face/face.c:415
+msgid "Include _Face"
+msgstr "å??å?«å¤§é ç?§(_F)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach a small picture of your face to outgoing messages.\n"
-"\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 encoded and stored in ~/.evolution/faces. This will be used in subsequent sent messages."
-msgstr ""
-"å?¨å¤?å¯?ç??é?µä»¶ä¸é??å? å¤§é è²¼ç?§ç??ã??\n"
-"\n"
-"ç¬¬ä¸?æ¬¡ä½¿ç?¨æ??é??è¦?å??è¨å®?ä¸?å¼µ 48x48 ç?? PNG å??ç??ã??å®?æ??ä»¥ Base-64 ç·¨ç¢¼ä¸¦å?²å?æ?¼ ~/.evolution/faces ã??é??æ??ç?¨å?¨æ?ªä¾?æ??å¯?å?ºç??é?µä»¶ä¸ã??"
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "å?¨å¤?å¯?é?µä»¶ä¸é??å¸¶æ??æ?¨è??é?¨ç??å°?ç?§ç??ã??"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾ ã??%sã??"
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "ç?¡æ³?è®?å??"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Unsubscribe Folders"
-msgstr "å??æ¶?è¨?é?±è³?æ??å¤¾"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "Invalid Image Size"
+msgstr "ç?¡æ??ç??å??ç??å¤§å°?"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
-msgstr "è¦?å??æ¶?è¨?é?± IMAP è³?æ??å¤¾ï¼?å?¯å?¨è³?æ??å¤¾æ¨¹ä¸å°?å®?æ??æ»?é¼ å?³é?µã??"
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr "ä¸?æ?¯å??ç??æª?"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "å??æ¶?è¨?é?±(_U)"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "è«?é?¸æ??å°ºå¯¸ç?º 48*48 ç??å??ç??"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "ä¸?è?½è®?å??é??å??æª?æ¡?"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr "æ?¨é?¸å??ç??æª?æ¡?ä¼¼ä¹?ä¸?æ?¯æ??æ??ç?? .png å??ç??ã??é?¯èª¤ï¼?{0}"
 
-#: ../plugins/google-account-setup/google-source.c:82
 #: ../plugins/google-account-setup/google-contacts-source.c:51
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:518
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+msgid "<b>Server</b>"
+msgstr "<b>ä¼ºæ??å?¨</b>"
+
+#: ../plugins/google-account-setup/google-source.c:517
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "è¼¸å?¥ä½¿ç?¨è?? %s ç??å¯?ç¢¼ä»¥å?å??å·²è¨?é?±ç??è¡?äº?æ??æ¸?å?®ã??"
 
-#: ../plugins/google-account-setup/google-source.c:624
+#: ../plugins/google-account-setup/google-source.c:623
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16292,19 +16558,20 @@ msgstr ""
 "ä¸?è?½å¾? Google ä¼ºæ??å?¨è®?å??è³?æ??ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:759
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:941
+msgid "Unknown error."
+msgstr "ä¸?æ??ç??é?¯èª¤ã??"
+
+#: ../plugins/google-account-setup/google-source.c:758
 msgid "Cal_endar:"
 msgstr "è¡?äº?æ??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:794
+#: ../plugins/google-account-setup/google-source.c:793
 msgid "Retrieve _list"
 msgstr "å??å??æ¸?å?®(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
-msgid "<b>Server</b>"
-msgstr "<b>ä¼ºæ??å?¨</b>"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
 msgstr "å°? Google æ?¥æ??å? å?¥ Evolutionã??"
@@ -16313,19 +16580,44 @@ msgstr "å°? Google æ?¥æ??å? å?¥ Evolutionã??"
 msgid "Google Calendars"
 msgstr "Google æ?¥æ??"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
 msgid "Checklist"
 msgstr "æª¢æ?¥æ¸?å?®"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Add Novell GroupWise support to Evolution."
-msgstr "å? å?¥ Evolution å°? Novell GroupWise ç??æ?¯æ?´ã??"
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "æ?°å¢?å??äº«è³?æ??å¤¾(_S)..."
+
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "ä»£ç??ä¼ºæ??å?¨ç?»å?¥(_P)..."
+
+#: ../plugins/groupwise-features/gw-ui.c:170
+msgid "Junk Mail Settings..."
+msgstr "å??å?¾é?µä»¶è¨å®?å?¼..."
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "GroupWare å¸³è??è¨å®?"
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "è¿½è¹¤é?µä»¶ç??æ??..."
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "æ?¶å??é?µä»¶"
+
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "æ?«æ??å¥?ç?¨"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "é??å¯?æ??è°(_N)..."
+
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
+msgid "Create folder"
+msgstr "å»ºç«?è³?æ??å¤¾"
+
+#: ../plugins/groupwise-features/install-shared.c:225
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16336,7 +16628,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "ä½¿ç?¨è??ã??%sã??å??äº«äº?ä¸?å??è³?æ??å¤¾çµ¦æ?¨\n"
@@ -16347,66 +16639,70 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"æ??ã??ç¹¼çº?ã??ä»¥å®?è£?å??äº«è³?æ??å¤¾\n"
+"æ??ã??å¥?ç?¨ã??ä»¥å®?è£?å??äº«è³?æ??å¤¾\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "å®?è£?å??äº«è³?æ??å¤¾"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:241
 msgid "Shared Folder Installation"
 msgstr "å??äº«è³?æ??å¤¾å®?è£?"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "å??å?¾é?µä»¶è¨å®?å?¼"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "å??å?¾é?µä»¶è¨å®?å?¼"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "å??å?¾é?µä»¶è¨å®?å?¼..."
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>å??å?¾é?µä»¶æ¸?å?®ï¼?</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "é?»å?é?µä»¶:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+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.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "å??ç?¨(_E)"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "å??å?¾é?µä»¶æ¸?å?®(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:52
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "ç§»é?¤(_R)"
+
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "é?µä»¶æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-retract.c:57
-msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this ?"
+#: ../plugins/groupwise-features/mail-retract.c:86
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this?"
 msgstr "æ?¶å??é?µä»¶å?¯è?½æ??å°?è©²é?µä»¶è?ªæ?¶ä»¶è??ç??ä¿¡ç®±ç§»é?¤ã??æ?¨ç¢ºå®?è¦?é??éº¼å??ï¼?"
 
-#: ../plugins/groupwise-features/mail-retract.c:76
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "é?µä»¶å·²æ??å??æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retract Mail"
-msgstr "æ?¶å??é?µä»¶"
+#: ../plugins/groupwise-features/mail-send-options.c:200
+msgid "Insert Send options"
+msgstr "æ??å?¥å?³é??é?¸é ?"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
@@ -16443,8 +16739,11 @@ msgid "Invalid user"
 msgstr "ç?¡æ??ç??ä½¿ç?¨è??"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
-msgstr "ä»¥ &quot;{0}&quot; ç?»å?¥ä»£ç??ä¼ºæ??å?¨å¤±æ??ã??è«?æª¢æ?¥æ?¨ç??é?»å?é?µä»¶ä½?å??ä¸¦å??è©¦ä¸?æ¬¡ã??"
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"ä»¥ &quot;{0}&quot; ç?»å?¥ä»£ç??ä¼ºæ??å?¨å¤±æ??ã??è«?æª¢æ?¥æ?¨ç??é?»å?é?µä»¶ä½?å??ä¸¦å??è©¦ä¸?æ¬¡ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
@@ -16475,16 +16774,16 @@ msgid "You have to specify a user name which you want to add to the list"
 msgstr "æ?¨å¿?é ?æ??å®?è¦?å? å?¥æ¸?å?®ä½¿ç?¨è??å??ç¨±"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting ?"
+msgid "Do you want to resend the meeting?"
 msgstr "æ?¯å?¦è¦?é??æ?°å?³é??é??å??æ??è°ï¼?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting ?"
-msgstr "ç¢ºå®?è¦?é??æ?°å?³é??æ¤é?±æ??æ?§æ??è°ï¼?"
+msgid "Do you want to resend the recurring meeting?"
+msgstr "æ?¯å?¦è¦?é??æ?°å?³é??æ¤é?±æ??æ?§æ??è°ï¼?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item ?"
-msgstr "ç¢ºå®?è¦?æ?¶å??å??å§?ç??é ?ç?®ï¼?"
+msgid "Do you want to retract the original item?"
+msgstr "æ?¯å?¦è¦?æ?¶å??å??å§?ç??é ?ç?®ï¼?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
 msgid "The original will be removed from the recipient's mailbox."
@@ -16499,8 +16798,11 @@ msgid "This will create a new meeting using the existing meeting details."
 msgstr "é??æ??ä½¿ç?¨æ?¢å?ç??æ??è°è©³ç´°è³?æ??å»ºç«?æ?°ç??æ??è°ã??"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
-msgstr "é??æ??ä½¿ç?¨æ?¢å?ç??æ??è°è©³ç´°è³?æ??å»ºç«?æ?°ç??æ??è°ã??å?¶ä¸é?±æ??æ?§è¦?å??ç??é?¨å??é??è¦?é??æ?°è¼¸å?¥ã??"
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+"é??æ??ä½¿ç?¨æ?¢å?ç??æ??è°è©³ç´°è³?æ??å»ºç«?æ?°ç??æ??è°ã??å?¶ä¸é?±æ??æ?§è¦?å??ç??é?¨å??é??è¦?é??æ?°è¼¸å?¥ã??"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
@@ -16512,221 +16814,191 @@ msgstr "æ?¨æ?³è¦?æ?¥å??å®?å??ï¼?"
 msgid "Would you like to decline it?"
 msgstr "æ?¨æ?³è¦?æ??çµ?å®?å??ï¼?"
 
-#: ../plugins/groupwise-features/process-meeting.c:53
-msgid "Accept Tentatively"
-msgstr "æ?«æ??å¥?ç?¨"
-
-#: ../plugins/groupwise-features/process-meeting.c:319
-msgid "Rese_nd Meeting..."
-msgstr "é??å¯?æ??è°(_N)..."
-
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>ä½¿ç?¨è??ï¼?</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "è?ªè¨?é??ç?¥è¨?æ?¯(_U)"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Con_tacts..."
 msgstr "é?£çµ¡äºº(_T)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:514
-msgid "Message"
-msgstr "é?µä»¶"
-
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "å??äº«è³?æ??å¤¾é??ç?¥"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "å??è??è??å°?æ??æ?¶å?°ä¸?å??é??ç?¥ã??\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "æ?ªå??äº«(_N)"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "å??äº«çµ¦(_S)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "å??äº«(_S)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>å??ç¨±</b>"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "å?å??æ¬?å?©"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "å? å?¥/ç·¨è¼¯"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "é?£çµ¡äºº(_T)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "ç·¨è¼¯è³?æ??å¤¾/é?¸é ?/è¦?å??/(_F)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "è®?å??æ¨?è¨?ç?ºç§?äººç??é ?ç?®(_P)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "æ??é??å?¨å??è¨»"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "è¨?é?±è?³æ??ç??é¬§é?´(_A)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "è¨?é?±è?³æ??ç??é??ç?¥(_N)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "å¯«å?¥(_W)"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "è®?(_R)"
 
-#. 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-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "ä»£ç??ä¼ºæ??å?¨"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>å¸³è??å??ç¨±</b>"
 
-#. 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-login-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "ç?»å?¥ä»£ç??ä¼ºæ??å?¨"
 
-#: ../plugins/groupwise-features/proxy-login.c:207
-#: ../plugins/groupwise-features/proxy-login.c:250
-#: ../plugins/groupwise-features/proxy.c:488
-#: ../plugins/groupwise-features/send-options.c:86
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy.c:495
+#: ../plugins/groupwise-features/send-options.c:85
 #, 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-login.c:512
-msgid "_Proxy Login..."
-msgstr "ä»£ç??ä¼ºæ??å?¨ç?»å?¥(_P)..."
-
 #. 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:689
+#: ../plugins/groupwise-features/proxy.c:692
 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:695
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ä»£ç??ä¼ºæ??å?¨é ?ç±¤å?ªæ??å?¨å??ç?¨æ¤å¸³è??æ??æ??æ??å?ºç?¾ã??"
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:701
+msgid "Add User"
+msgstr "å? å?¥ä½¿ç?¨è??"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "é?²é??å?³é??é?¸é ?"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "ä½¿ç?¨è??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "è¼¸å?¥ä½¿ç?¨è??ä¸¦è¨å®?æ¬?é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
-msgid "New _Shared Folder..."
-msgstr "æ?°å¢?å??äº«è³?æ??å¤¾(_S)..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "å??äº«"
 
-#: ../plugins/groupwise-features/share-folder.c:531
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "è?ªè¨?é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
 msgstr "æ?°å¢?"
 
-#: ../plugins/groupwise-features/share-folder.c:759
+#: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "ä¿®æ?¹"
 
-#: ../plugins/groupwise-features/status-track.c:94
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "é?µä»¶ç??æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:108
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "ä¸»æ?¨:"
 
-#: ../plugins/groupwise-features/status-track.c:122
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "å¯?ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "å»ºç«?æ?¥æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:176
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Recipient: "
 msgstr "æ?¶ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:183
+#: ../plugins/groupwise-features/status-track.c:211
 msgid "Delivered: "
 msgstr "å·²é??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Opened: "
 msgstr "å·²é??å??:"
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Accepted: "
 msgstr "å·²æ?¥å??:"
 
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Deleted: "
 msgstr "å·²å?ªé?¤:"
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Declined: "
 msgstr "å·²å©?æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Completed: "
 msgstr "å·²å®?æ??: "
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Undelivered: "
 msgstr "æ?ªé??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:238
-msgid "Track Message Status..."
-msgstr "è¿½è¹¤é?µä»¶ç??æ??..."
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "Add Hula support to Evolution."
 msgstr "å? å?¥ Evolution å°? Hula ç??æ?¯æ?´ã??"
@@ -16735,35 +17007,38 @@ msgstr "å? å?¥ Evolution å°? Hula ç??æ?¯æ?´ã??"
 msgid "Hula Support"
 msgstr "Hula æ?¯æ?´"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "è¡?å?§å??ç??"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "ç?´æ?¥å?¨é?µä»¶ä¸é¡¯ç¤ºå??ç??ã??"
+
+#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "è?ªè¨?æª?é "
 
-#: ../plugins/imap-features/imap-headers.c:345
+#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP æª?é "
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>è?ªè¨?æª?é </b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>IMAP æ¨?é </b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "å?ºæ?¬è??é??ä¿¡è«?å£?æª?é (é ?è¨å?¼)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
 "æ??ä¾?å?¨ä¸?å??æ¨?æº?æª?é ä»¥å¤?æ?¨æ?³è¦?æ?¥æ?¶ç??é¡?å¤?æª?é ã??\n"
 "å¦?æ??æ?¨é?¸æ??äº?ã??å®?æ?´æª?é ã??å??å?¯ä»¥å¿½ç?¥æ¤é ?ã??"
 
-#: ../plugins/imap-features/imap-headers.glade.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -16771,7 +17046,7 @@ msgstr ""
 "é?¸æ??æ?³è¦?ç?? IMAP æª?é å??å¥½è¨å®?ã??\n"
 "æ??å¤?æª?é æ??è?±æ??å¤?ç??æ??é??ä¸?è¼?å®?ã??"
 
-#: ../plugins/imap-features/imap-headers.glade.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -16779,7 +17054,7 @@ msgstr ""
 "å?ºæ?¬æª?é (_B) - (æ??å¿«)\n"
 "è?¥æ²?æ??é??ä¿¡è«?å£?é??æ¿¾å?¨å??å?¯ä½¿ç?¨æ¤é ?"
 
-#: ../plugins/imap-features/imap-headers.glade.h:10
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
 msgstr "æ?·å??æ??æ??é?µä»¶æª?é (_F)"
 
@@ -16791,658 +17066,668 @@ msgstr "æ ¡èª¿æ?¨ç?? IMAP å¸³è??ã??"
 msgid "IMAP Features"
 msgstr "IMAP å??è?½"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "ç?¡æ³?è¼?å?¥ç¡¬é«?æ?½è±¡å±¤"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-msgid "The \"hald\" service is required but not currently running. Please enable the service and rerun this program, or contact your system administrator."
-msgstr "ã??haldã??æ??å??æ?¯å¿?è¦?ç??ä½?ç?®å??ä¸¦æ?ªå?·è¡?ã??è«?å??ç?¨è©²æ??å??å¾?å??å??å?°æ?¬ç¨?å¼?ï¼?æ??è??é?£çµ¡æ?¨ç??ç³»çµ±ç®¡ç??è??ã??"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
-msgid "Search for an iPod failed"
-msgstr "æ??å°? iPod å¤±æ??"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid "Evolution could not find an iPod to synchronize with. Either the iPod is not connected to the system or it is not powered on."
-msgstr "Evolution ç?¡æ³?æ?¾å?°è¦?å??æ¥å??ç?? iPodã??å?¯è?½æ?¯ iPod å°?æ?ªé?£æ?¥å?°ç³»çµ±æ??è??æ²?æ??æ??é??é?»æº?ã??"
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar æ ¼å¼? (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize to iPod"
-msgstr "å??æ¥å?? iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize your data with your Apple iPod."
-msgstr "å°?æ?¨ç??è³?æ??è?? Apple iPod å??æ¥å??ã??"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "iPod å??æ¥å??"
-
-#: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:494
+#: ../plugins/itip-formatter/itip-formatter.c:619
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "è¼?å?¥è¡?äº?æ??ã??%sã??å¤±æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:639
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "è¡?äº?æ?? '%s' ä¸ç??ç´?æ??å??é??å??æ??è°ç?¸è¡?çª?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:675
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "å°?æ?¾å?¨è¡?äº?æ??ã??%sã??ä¸ç??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:774
 msgid "Unable to find any calendars"
 msgstr "æ?¾ä¸?å?°ä»»ä½?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:781
 msgid "Unable to find this meeting in any calendar"
 msgstr "ç?¡æ³?å?¨ä»»ä½?è¡?äº?æ??ä¸æ?¾å?°é??å??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:785
 msgid "Unable to find this task in any task list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸æ?¾å?°é??é ?å·¥ä½?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸æ?¾å?°é??é ?å??å¿?é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:839
+#: ../plugins/itip-formatter/itip-formatter.c:860
 msgid "Opening the calendar. Please wait.."
 msgstr "æ£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:842
+#: ../plugins/itip-formatter/itip-formatter.c:863
 msgid "Searching for an existing version of this appointment"
 msgstr "å°?æ?¾é??å??ç´?æ??æ?¢å?ç??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1044
 msgid "Unable to parse item"
 msgstr "ç?¡æ³?å??æ??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1111
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ç?¡æ³?å?³é??é ?ç?®è?³è¡?äº?æ??ã??%sã??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1127
+#: ../plugins/itip-formatter/itip-formatter.c:1147
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºä¸?ç¢ºå®?ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' ä¸¦è¨ç?ºå·²å©?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1137
+#: ../plugins/itip-formatter/itip-formatter.c:1157
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å?³é??è?³è¡?äº?æ??ã??%sã??ä¸¦è¨ç?ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æ??è°å?¬é??äººå·²ç§»é?¤ä»£ç??äºº %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1258
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ç?¡æ³?å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??äºº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??ä½¿å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1400
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ç?¡æ³?æ?´æ?°å?°æ??è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1381
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Attendee status updated"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1430
 msgid "Meeting information sent"
 msgstr "æ??è°è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1433
 msgid "Task information sent"
 msgstr "å·¥ä½?è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1436
 msgid "Memo information sent"
 msgstr "å??å¿?é??è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ç?¡æ³?å¯?å?ºæ??è°è³?è¨?ï¼?è©²æ??è°ä¸¦ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Unable to send task information, the task does not exist"
 msgstr "ç?¡æ³?å¯?å?ºå·¥ä½?è³?è¨?ï¼?è©²é ?å·¥ä½?ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ç?¡æ³?å¯?å?ºå??å¿?é??è³?è¨?ï¼?è©²å??å¿?é??ä¸¦ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1496
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1516
+msgid "calendar.ics"
+msgstr "calendar.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1521
+msgid "Save Calendar"
+msgstr "å?²å?è¡?äº?æ??"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1574
+#: ../plugins/itip-formatter/itip-formatter.c:1585
 msgid "The calendar attached is not valid"
 msgstr "é??å¸¶ç??è¡?äº?æ??æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1508
-msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "æ¤é?µä»¶å®£å??å?¶å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?å?¶è¡?äº?æ??ä¸¦é??æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1548
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../plugins/itip-formatter/itip-formatter.c:1654
+#: ../plugins/itip-formatter/itip-formatter.c:1760
 msgid "The item in the calendar is not valid"
 msgstr "è¡?äº?æ??ä¸ç??é ?ç?®æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1549
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1669
-msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
-msgstr "æ¤é?µä»¶ç¢ºå¯¦å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?è©²å?§å®¹ä¸¦æ?ªå??å?«ä»»ä½?äº?ä»¶ã??å·¥ä½?æ??ç©ºé??/å¿?ç¢?è³?è¨?"
+#: ../plugins/itip-formatter/itip-formatter.c:1627
+#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1761
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"æ¤é?µä»¶ç¢ºå¯¦å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?è©²å?§å®¹ä¸¦æ?ªå??å?«ä»»ä½?äº?ä»¶ã??å·¥ä½?æ??ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1589
-msgid "To process all of these items, the file should be saved and the calendar imported"
+#: ../plugins/itip-formatter/itip-formatter.c:1669
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??è©²å°?æ¤æª?æ¡?å?²å?å¾?å?¯å?¥å?¶ä¸ç??è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2434
 msgid "This meeting recurs"
 msgstr "é??å??æ??è°ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../plugins/itip-formatter/itip-formatter.c:2437
 msgid "This task recurs"
 msgstr "é??é ?å·¥ä½?ç??å¾ªç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2341
+#: ../plugins/itip-formatter/itip-formatter.c:2440
 msgid "This memo recurs"
 msgstr "é??å??å??å¿?é??ç??å¾ªç?°è¦?å??ç?º"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2574
+#: ../plugins/itip-formatter/itip-formatter.c:2669
 msgid "_Delete message after acting"
 msgstr "å®?æ??å¾?å?ªé?¤é?µä»¶(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2584
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2679
+#: ../plugins/itip-formatter/itip-formatter.c:2712
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 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:196
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M"
 msgstr "ä»?å¤© %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %H:%M:%S"
 msgstr "ä»?å¤© %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:213
 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:224
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M"
 msgstr "æ??å¤© %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:232
 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:233
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M %p"
 msgstr "æ??å¤©%p %-l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:241
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "æ??å¤©%p %-l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:260
 #, 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:261
+#: ../plugins/itip-formatter/itip-view.c:265
 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:265
+#: ../plugins/itip-formatter/itip-view.c:269
 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:270
+#: ../plugins/itip-formatter/itip-view.c:274
 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:274
+#: ../plugins/itip-formatter/itip-view.c:278
 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:283
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e"
 msgstr "%-m æ?? %d æ?¥ (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M"
 msgstr "%-m æ?? %d æ?¥ (%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m æ?? %d æ?¥ (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:330
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../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:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../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:358
+#: ../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:360
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?ä¸?å??æ??è°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> å·²ç¶?å§?æ´¾ä¸?å??æ??è°çµ¦æ?¨ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../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 é??è«?æ?¨å?ºå¸ä¸?å??æ??è°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> é??è«?æ?¨å?ºå¸ä¸?å??æ??è°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??æ??è°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??æ??è°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
 msgstr "<b>%s</b> é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??è°ç??æ??æ?°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> å¸?æ??æ?¶å?°ä¸?å??æ??è°ç??æ??æ?°å·¥ä½?è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../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 å?³é??äº?ä¸?å??æ??è°ç??å??è¦?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> å?³é??äº?ä¸?å??æ??è°ç??å??è¦?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../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 å·²ç¶?æ¶?å??ä¸?å??æ??è°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> å·²ç¶?æ¶?å??ä¸?å??æ??è°ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../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 å·²ç¶?ç?è¦?äº?ä¸?å??æ??è°è®?æ?´ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> å·²ç¶?ç?è¦?äº?ä¸?å??æ??è°è®?æ?´ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../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 å·²ç¶?å©?æ??äº?ä¸?å??æ??è°è®?æ?´ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> å·²ç¶?å©?æ??äº?ä¸?å??æ??è°è®?æ?´ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> æ??æ´¾ %s å? å?¥ä¸?å??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:460
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?æ??æ´¾æ?¨ä¸?é ?å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> å·²ç¶?æ??æ´¾æ?¨ä¸?é ?å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?é ?æ?¢å?ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?é ?æ?¢å?ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
 msgstr "<b>%s</b> é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??æ´¾å·¥ä½?ç??æ??æ?°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
 msgstr "<b>%s</b> å¸?æ??æ?¶å?°ä¸?å??æ??æ´¾å·¥ä½?ç??æ??æ?°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> é??é?? %s å?³é??äº?ä¸?å??æ??æ´¾å·¥ä½?ç??å??è¦?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../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> å?³é??äº?ä¸?å??æ??æ´¾å·¥ä½?ç??å??è¦?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../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 å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> é??é?? %s å·²ç¶?å??è¦?ä¸?å??æ??æ´¾å·¥ä½?ç??è®?æ?´ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> å·²ç¶?å??è¦?ä¸?å??æ??æ´¾å·¥ä½?ç??è®?æ?´ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../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 å·²å©?æ??äº?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> å·²ç¶?å©?æ??ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?æ¶?å??ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> å·²ç¶?å??æ¶?ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
 
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr "æ?´å¤©ï¼?"
+
+#: ../plugins/itip-formatter/itip-view.c:686
+msgid "Start day:"
+msgstr "é??å§?æ?¥ï¼?"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1041
+msgid "Start time:"
+msgstr "é??å§?æ??é??:"
+
+#: ../plugins/itip-formatter/itip-view.c:698
+msgid "End day:"
+msgstr "çµ?æ??æ?¥ï¼?"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "End time:"
+msgstr "çµ?æ??æ??é??:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:823
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "é??å??è¡?äº?æ??(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../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:833
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "å?¨é?¨æ??çµ?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "å?¨é?¨æ?«è¨?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../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
 msgid "_Tentative"
 msgstr "æ?«è¨?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Accept all"
 msgstr "å?¨é?¨æ?¥å??(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Send Information"
 msgstr "å?³é??è³?è¨?(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "æ?´æ?°å?ºå¸ç??æ??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Start time:"
-msgstr "é??å§?æ??é??:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1044
-msgid "End time:"
-msgstr "çµ?æ??æ??é??:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1064
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:1126
 msgid "Comment:"
 msgstr "è¨»è§£:"
 
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Send _reply to sender"
 msgstr "å??è¦?å¯?ä»¶è??(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1141
 msgid "Send _updates to attendees"
 msgstr "å?³é??æ?´æ?°çµ¦å?°æ??è??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1142
+#: ../plugins/itip-formatter/itip-view.c:1150
 msgid "_Apply to all instances"
 msgstr "å¥?ç?¨è?³æ??æ??å¯¦é«?(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1151
+#: ../plugins/itip-formatter/itip-view.c:1159
 msgid "Show time as _free"
 msgstr "é¡¯ç¤ºæ??é??ç?ºç©ºé??(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Preserve my reminder"
 msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1160
+#: ../plugins/itip-formatter/itip-view.c:1168
 msgid "_Inherit reminder"
 msgstr "ç¹¼æ?¿æ??é??(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
+#: ../plugins/itip-formatter/itip-view.c:1911
+msgid "_Tasks:"
+msgstr "å·¥ä½?(_T):"
+
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "å??å¿?é??(_M):"
 
@@ -17455,7 +17740,9 @@ 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;?"
+msgid ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot;?"
 msgstr "ã??{0}ã??å·²ä»£ç??æ¤æ??è°ã??æ?¯å?¦é??è¦?å? å?¥ä»£ç??äººã??{1}ã??ï¼?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -17463,21 +17750,10 @@ msgid "This meeting has been delegated"
 msgstr "é??å??æ??è°å·²å§?æ´¾"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "é??å??å??è¦?ä¸¦é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?å¯?ä»¶äººå? å?¥ç?ºå?°æ??è??ï¼?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-msgid "Proxy _Logout"
-msgstr "ç?»å?ºä»£ç??ä¼ºæ??å?¨(_L)"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Disable Account"
-msgstr "å??ç?¨å¸³è??"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable an account by right-clicking on it in the folder tree."
-msgstr "è¦?å??ç?¨å¸³è??ï¼?å?¯å?¨è³?æ??å¤¾æ¨¹ä¸å°?å®?æ??æ»?é¼ å?³é?µã??"
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "ç?¼å?ºå?¶è?²æ??æ?æ?¾è?²é?³æª?æ¡?ã??"
@@ -17499,7 +17775,9 @@ 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
-msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??ç?¶æ?°é?µä»¶æ?µé??æ??ç?¼å?ºå?¶è?²å?¦å??å°±æ?æ?¾è?²é?³æª?ã??"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
@@ -17511,51 +17789,55 @@ msgid "Play sound when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?æ?¾è?²é?³æª?æ¡?ã??"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+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
 msgid "Popup message together with the icon."
 msgstr "å?¨å??ç¤ºä¸?å½?å?ºæ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??å?¨é??ç?¥å??é¡¯ç¤ºæ?°é?µä»¶å??ç¤ºã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "è¦?æ?æ?¾ç??è?²é?³æª?æ¡?å??ç¨±ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "æ?°é?µä»¶é??å?°æ??è¦?æ?æ?¾ç??é?³æ??æª?æ¡?ï¼?å¦?æ??ä¸?æ?¯ä½¿ç?¨å?¶è?²æ¨¡å¼?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Use sound theme"
+msgstr "ä½¿ç?¨é?³æ??ä¸»é¡?"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?¯å?¦æ?æ?¾è?²é?³æª?æ¡?æ??ç?¼å?ºå?¶è?²ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "æ?¯å?¦å?¨æ?°é?µä»¶æ?µé??æ??æ?¼å??ç¤ºä¸?å½?å?ºè¨?æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../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:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:245
-msgid "Generate a _D-Bus message"
-msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
-
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
 msgstr "Evolution ç??æ?°é?µä»¶é??ç?¥"
 
-#: ../plugins/mail-notification/mail-notification.c:389
+#: ../plugins/mail-notification/mail-notification.c:366
 msgid "Mail Notification Properties"
 msgstr "æ?°é?µä»¶é??ç?¥å±¬æ?§"
 
-#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:498
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:495
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17570,58 +17852,70 @@ msgstr[1] ""
 "æ?¨å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? \n"
 "ä½?æ?¼ %sã??"
 
-#: ../plugins/mail-notification/mail-notification.c:503
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:506
+#, 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
+#, c-format
+msgid "Subject: %s"
+msgstr "ä¸»æ?¨ï¼?%s"
+
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "æ?¨å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 msgstr[1] "æ?¨å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 
-#: ../plugins/mail-notification/mail-notification.c:520
-#: ../plugins/mail-notification/mail-notification.c:525
+#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:550
 msgid "New email"
 msgstr "æ?°é?µä»¶"
 
-#: ../plugins/mail-notification/mail-notification.c:588
+#: ../plugins/mail-notification/mail-notification.c:604
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å??ä¸é¡¯ç¤ºå??ç¤º(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:632
 msgid "B_link icon in notification area"
 msgstr "è®?é??ç?¥å??å??ç¤ºé??ç??(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:593
+#: ../plugins/mail-notification/mail-notification.c:642
 msgid "Popup _message together with the icon"
 msgstr "å?¨å??ç¤ºä¸?å½?å?ºè¨?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:827
 msgid "_Play sound when new messages arrive"
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?æ?¾è?²é?³æª?æ¡?(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:780
+#: ../plugins/mail-notification/mail-notification.c:856
 msgid "_Beep"
 msgstr "å?¶è?²(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:781
-msgid "Play _sound file"
-msgstr "æ?æ?¾è?²é?³æª?æ¡?(_S)"
+#: ../plugins/mail-notification/mail-notification.c:869
+msgid "Use sound _theme"
+msgstr "ä½¿ç?¨é?³æ??ä¸»é¡?(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:792
-msgid "Specify _filename:"
-msgstr "æ??å®?æª?æ¡?å??ç¨±(_F):"
+#: ../plugins/mail-notification/mail-notification.c:888
+msgid "Play _file:"
+msgstr "æ?æ?¾æª?æ¡?(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:793
+#: ../plugins/mail-notification/mail-notification.c:899
 msgid "Select sound file"
 msgstr "é?¸æ??è?²é?³æª?æ¡?"
 
-#: ../plugins/mail-notification/mail-notification.c:794
-msgid "Pl_ay"
-msgstr "æ?æ?¾(_A)"
-
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:957
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶(_I)"
 
+#: ../plugins/mail-notification/mail-notification.c:966
+msgid "Generate a _D-Bus message"
+msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
+
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "é?µä»¶é??ç?¥"
@@ -17630,178 +17924,235 @@ msgstr "é?µä»¶é??ç?¥"
 msgid "Notifies you when new mail messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??é??ç?¥æ?¨ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:376
+#. 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
+#, c-format
+msgid "Created from a mail by %s"
+msgstr "å¾? %s ç??é?µä»¶æ??å»ºç«?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
-msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«äº?ä»¶ã??%sã??ã??æ?¯å?¦è¦?ç·¨è¼¯æ¤è??ç??äº?ä»¶ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:379
+#: ../plugins/mail-to-task/mail-to-task.c:499
 #, c-format
-msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
 msgstr "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«å·¥ä½?ã??%sã??ã??æ?¯å?¦è¦?ç·¨è¼¯æ¤è??ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:382
+#: ../plugins/mail-to-task/mail-to-task.c:502
 #, c-format
-msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
 msgstr "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«å??å¿?é??ã??%sã??ã??æ?¯å?¦è¦?ç·¨è¼¯æ¤è??ç??å??å¿?é??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:399
-msgid "Selected calendar contains some events for the given mails already. Would you like to create new events anyway?"
+#: ../plugins/mail-to-task/mail-to-task.c:519
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
 msgstr "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸ç??äº?ä»¶ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?ä»¶ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:402
-msgid "Selected task list contains some tasks for the given mails already. Would you like to create new tasks anyway?"
+#: ../plugins/mail-to-task/mail-to-task.c:522
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
 msgstr "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:405
-msgid "Selected memo list contains some memos for the given mails already. Would you like to create new memos anyway?"
-msgstr "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
+#: ../plugins/mail-to-task/mail-to-task.c:525
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+"é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:423
-msgid "Selected calendar contains an event for the given mail already. Would you like to create new event anyway?"
-msgid_plural "Selected calendar contains events for the given mails already. Would you like to create new events anyway?"
+#: ../plugins/mail-to-task/mail-to-task.c:543
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
 msgstr[0] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??äº?ä»¶ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?ä»¶ï¼?"
 msgstr[1] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??äº?ä»¶ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?ä»¶ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:429
-msgid "Selected task list contains a task for the given mail already. Would you like to create new task anyway?"
-msgid_plural "Selected task list contains tasks for the given mails already. Would you like to create new tasks anyway?"
+#: ../plugins/mail-to-task/mail-to-task.c:549
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
 msgstr[0] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 msgstr[1] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:435
-msgid "Selected memo list contains a memo for the given mail already. Would you like to create new memo anyway?"
-msgid_plural "Selected memo list contains memos for the given mails already. Would you like to create new memos anyway?"
-msgstr[0] "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
-msgstr[1] "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
+#: ../plugins/mail-to-task/mail-to-task.c:555
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+"é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
+msgstr[1] ""
+"é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:494
+#: ../plugins/mail-to-task/mail-to-task.c:614
 msgid "[No Summary]"
 msgstr "[æ²?æ??æ??è¦?]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:505
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "Invalid object returned from a server"
 msgstr "å¾?ä¼ºæ??å?¨å?³å??ç?¡æ??ç??ç?©ä»¶"
 
-#: ../plugins/mail-to-task/mail-to-task.c:570
+#: ../plugins/mail-to-task/mail-to-task.c:696
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "å?¨è??ç??æ??é??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ç?¡æ³?é??å??è¡?äº?æ??ã??%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
-msgid "Selected source is read only, thus cannot create event there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:732
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
 msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ¤ä¸?è?½å?¨é??è£¡å»ºç«?äº?ä»¶ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
-msgid "Selected source is read only, thus cannot create task there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:735
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
 msgstr "é?¸å®?ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ¤ä¸?è?½å?¨é??è£¡å»ºç«?å·¥ä½?ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:612
-msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
+#: ../plugins/mail-to-task/mail-to-task.c:738
+msgid ""
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ¤ä¸?è?½å?¨é??è£¡å»ºç«?å??å¿?é??ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:941
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ä¸?è?½å??å¾?ä¾?æº?æ¸?å?®ã??%s"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "Convert a mail message to a task."
-msgstr "å°?é?µä»¶è½?æ??ç?ºå·¥ä½?ã??"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Create a Mem_o"
-msgstr "å»ºç«?å??å¿?é??(_O)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Create a _Meeting"
-msgstr "å»ºç«?æ??è°(_M)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
-msgid "Create a _Task"
-msgstr "å»ºç«?å·¥ä½?(_T)"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create an _Event"
 msgstr "å»ºç«?äº?ä»¶(_E)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
-msgid "Mail-to-Task"
-msgstr "é?µä»¶è½?å·¥ä½?"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new event from the selected message"
 msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??äº?ä»¶"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
-msgid "Create a new meeting from the selected message"
-msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è°"
+#: ../plugins/mail-to-task/mail-to-task.c:1067
+msgid "Create a Mem_o"
+msgstr "å»ºç«?å??å¿?é??(_O)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new memo from the selected message"
 msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å??å¿?é??"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#: ../plugins/mail-to-task/mail-to-task.c:1074
+msgid "Create a _Task"
+msgstr "å»ºç«?å·¥ä½?(_T)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new task from the selected message"
 msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å·¥ä½?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "é?£çµ¡äººæ¸?å?®æ??æ??è??(_O)"
+#: ../plugins/mail-to-task/mail-to-task.c:1084
+msgid "Create a _Meeting"
+msgstr "å»ºç«?æ??è°(_M)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
+#: ../plugins/mail-to-task/mail-to-task.c:1086
+msgid "Create a new meeting from the selected message"
+msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è°"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "å°?é?µä»¶è½?æ??ç?ºå·¥ä½?ã??"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+msgid "Get List _Archive"
 msgstr "å??å¾?æ¸?å?®æª?æ¡?åº«(_A)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+msgid "Get an archive of the list this message belongs to"
+msgstr "å??å¾?æ¤é?µä»¶æ??å±¬è«?å£?ç??æª?æ¡?åº«"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+msgid "Get List _Usage Information"
 msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "é??ä¿¡è«?å£?å??ä½?"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "å??å¾?æ¤é?µä»¶æ??å±¬è«?å£?ç??ä½¿ç?¨æ?¹æ³?ç?¸é??è³?è¨?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "é??ä¿¡è«?å£?(_L)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+msgid "Contact List _Owner"
+msgstr "é?£çµ¡äººæ¸?å?®æ??æ??è??(_O)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr "å?·è¡?ä¸?è?¬é??ä¿¡è«?å£?æ??ä»¤ç??å??ä½? ï¼?è¨?é?±ã??å??æ¶?è¨?é?±ç?ç?â?¦ï¼?ã??"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "é?£çµ¡æ¤é?µä»¶æ??å±¬é??ä¿¡è«?å£?ç??ç®¡ç??è??"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+msgid "_Post Message to List"
 msgstr "å?³é??é?µä»¶çµ¦è«?å£?(_P)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "æ?°å¯«é?µä»¶çµ¦æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+msgid "_Subscribe to List"
 msgstr "è¨?é?±è«?å£?(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "è¨?é?±æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+msgid "_Unsubscribe from List"
 msgstr "å??æ¶?è¨?é?±è«?å£?(_U)"
 
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "å??æ¶?è¨?é?±æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+msgid "Mailing _List"
+msgstr "é??ä¿¡è«?å£?(_L)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "é??ä¿¡è«?å£?å??ä½?"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "å?·è¡?ä¸?è?¬é??ä¿¡è«?å£?æ??ä»¤ç??å??ä½? ï¼?è¨?é?±ã??å??æ¶?è¨?é?±ç?ç?â?¦ï¼?ã??"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "ç?¡æ³?ä½¿ç?¨å??ä½?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"å?³å°?å¯?å?ºä¸?å°?é?»å?é?µä»¶è?³ URL \"{0}\"ã??æ?¨å?¯ä»¥è?ªå??é??å?ºé?µä»¶ï¼?æ??æ?¯å??æ?¥ç??ä¸¦å??äº?æ?¹è®?ã??\n"
+"å?³å°?å¯?å?ºä¸?å°?é?»å?é?µä»¶è?³ URL \"{0}\"ã??æ?¨å?¯ä»¥è?ªå??é??å?ºé?µä»¶ï¼?æ??æ?¯å??æ?¥ç??ä¸¦å??äº?æ?¹"
+"è®?ã??\n"
 "\n"
 "å?¨é??å°?é?µä»¶é??å?ºå¾?ä¸?ä¹?æ?¨æ??è©²æ??æ?¶å?°ä¾?è?ªé??ä¿¡è«?å£?ç??å??æ??ã??"
 
@@ -17818,8 +18169,12 @@ msgid "Posting not allowed"
 msgstr "ä¸?å??è¨±å¼µè²¼"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
-msgstr "å°?æ¤é??ä¿¡è«?å£?ç??å¼µè²¼æ?¯ä¸?è¢«å??è¨±ç??ã??é??å?¯è?½æ?¯ä¸?å??å?¯è®?ç??é??ä¿¡è«?å£?ã??è«?é?£çµ¡è«?å£?ç??ç®¡ç??è??ä»¥å??å¾?é?²ä¸?æ¥è³?è¨?ã??"
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"å°?æ¤é??ä¿¡è«?å£?ç??å¼µè²¼æ?¯ä¸?è¢«å??è¨±ç??ã??é??å?¯è?½æ?¯ä¸?å??å?¯è®?ç??é??ä¿¡è«?å£?ã??è«?é?£çµ¡è«?å£?ç??ç®¡ç??"
+"è??ä»¥å??å¾?é?²ä¸?æ¥è³?è¨?ã??"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -17827,7 +18182,8 @@ msgstr "å?³é??é?µä»¶å?°é??ä¿¡è«?å£?ï¼?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17846,7 +18202,9 @@ msgstr ""
 "æª?é ï¼? {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid "This message does not contain the header information required for this action."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "é??å°?é?µä»¶æ²?æ??å??å?«æ¤å??ä½?æ??é??ç??æª?é è³?è¨?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -17857,129 +18215,72 @@ msgstr "ç·¨è¼¯é?µä»¶(_E)"
 msgid "_Send message"
 msgstr "å?³é??é?µä»¶(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "é?£çµ¡äººæ¸?å?®æ??æ??è??(_O)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "é?£çµ¡æ¤é?µä»¶æ??å±¬é??ä¿¡è«?å£?ç??ç®¡ç??è??"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "å??å¾?æ¸?å?®æª?æ¡?åº«(_A)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get an archive of the list this message belongs to"
-msgstr "å??å¾?æ¤é?µä»¶æ??å±¬è«?å£?ç??æª?æ¡?åº«"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-msgid "Get information about the usage of the list this message belongs to"
-msgstr "å??å¾?æ¤é?µä»¶æ??å±¬è«?å£?ç??ä½¿ç?¨æ?¹æ³?ç?¸é??è³?è¨?"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "æ?°å¯«é?µä»¶çµ¦æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "è¨?é?±æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "å??æ¶?è¨?é?±æ¤é?µä»¶æ??å±¬ç??é??ä¿¡è«?å£?"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "å?³é??é?µä»¶çµ¦è«?å£?(_P)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "è¨?é?±è«?å£?(_S)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "å??æ¶?è¨?é?±è«?å£?(_U)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "æ?¯å?¦ä¹?æ¨?è¨?å?è³?æ??å¤¾ä¸ç??é?µä»¶ï¼?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
-msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
-msgstr "æ?¨è¦?å°?ç?®å??ç??è³?æ??å¤¾ä¸ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µä»¶ã??"
+#: ../plugins/mark-all-read/mark-all-read.c:44
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"æ?¨è¦?å°?ç?®å??ç??è³?æ??å¤¾ä¸ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µ"
+"ä»¶ã??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:166
+#: ../plugins/mark-all-read/mark-all-read.c:171
 msgid "In Current Folder and _Subfolders"
 msgstr "æ?¼ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:180
+#: ../plugins/mark-all-read/mark-all-read.c:185
 msgid "In Current _Folder Only"
 msgstr "æ?¼ç?®å??ç??è³?æ??å¤¾(_F)"
 
+#: ../plugins/mark-all-read/mark-all-read.c:342
+msgid "Mark Me_ssages as Read"
+msgstr "æ¨?ç¤ºé?µä»¶ç?ºå·²è®?(_S)"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "å?¨é?¨æ¨?ç¤ºæ??å·²è®?"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "æ¨?ç¤ºé?µä»¶ç?ºå·²è®?(_S)"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Mark all messages in a folder as read."
 msgstr "å°?è³?æ??å¤¾ä¸å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?ã??"
 
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "Mono Loader"
-msgstr "Mono è¼?å?¥å?¨"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Support plugins written in Mono."
-msgstr "æ?¯æ?´ä»¥ Mono ç·¨å¯«ç??å¤?æ??ç¨?å¼?ã??"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "Manage your Evolution plugins."
 msgstr "ç®¡ç??æ?¨ç?? Evolution å¤?æ??ç¨?å¼?ã??"
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
 msgstr "å¤?æ??ç¨?å¼?ç®¡ç??å?¡"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
-msgid "Enable and disable plugins"
-msgstr "å??ç?¨è??å??ç?¨å¤?æ??ç¨?å¼?"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "_Plugins"
-msgstr "å¤?æ??ç¨?å¼?(_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "ä½?è??"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "çµ?æ??"
-
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "æ³¨æ??ï¼?æ??äº?è®?æ?´å?¨é??æ?°å??å??å¾?æ??æ??ç??æ??"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "æ¦?è¦½"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
 msgstr "å¤?æ??ç¨?å¼?"
 
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "å¤?æ??ç¨?å¼?(_P)"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "å??ç?¨è??å??ç?¨å¤?æ??ç¨?å¼?"
+
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -17993,19 +18294,39 @@ msgstr "å??å¥½ç´?æ??å?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ä»¥ç´?æ??å?æ?¹å¼?æª¢è¦?é?µä»¶ï¼?å?³ä½¿å®?å??å?«æ?? HTML å?§å®¹ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??é¡¯ç¤ºä¹?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "å??å¥½ç´?æ??å?"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr "è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?é¡¯ç¤ºã??"
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid "Show plain text if present"
+msgstr "å¦?æ??ä¾?ç´?æ??å?å??é¡¯ç¤ºå®?"
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr "å¦?æ??æ??ç´?æ??å?ç??é?¨å??å°±é¡¯ç¤ºå®?ï¼?å?¦å??è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?é¡¯ç¤ºã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid "Only ever show plain text"
 msgstr "å?ªä»¥ç´?æ??å?é¡¯ç¤º"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr "å¦?æ??æ??è¦?æ±?æ??ï¼?æ°¸é? é¡¯ç¤ºç´?æ??å?ç??é?¨å??ä¸¦å¾?å?¶ä»?ç??é?¨å??è£½ä½?é??ä»¶ã??"
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "å°?æ??å?¶ç?? HTML é?¨å??é¡¯ç¤ºç?ºé??ä»¶(_U)"
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "HT_ML æ¨¡å¼?"
 
@@ -18029,26 +18350,37 @@ msgstr "Outlook PST å?¯å?¥"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook å??äººè³?æ??å¤¾ (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:299
+msgid "_Mail"
+msgstr "é?µä»¶(_M)"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:315
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "_Address Book"
 msgstr "é??è¨?é??(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:322
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "A_ppointments"
 msgstr "ç´?æ??(_P)"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "å·¥ä½?(_T)"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:334
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "_Journal entries"
 msgstr "æ?¥èª?é ?ç?®(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:349
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "Importing Outlook data"
 msgstr "å?¯å?¥ Outlook è³?æ??"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "è¡?äº?æ??ç?¼ä½?"
 
@@ -18060,141 +18392,139 @@ msgstr "ä½?ç½®"
 msgid "Publish calendars to the web."
 msgstr "å°?è¡?äº?æ??ç?¼ä½?ç?ºç¶²é ?ã??"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "ç?¼ä½?è¡?äº?æ??è³?è¨?(_P)"
-
-#: ../plugins/publish-calendar/publish-calendar.c:95
-#: ../plugins/publish-calendar/publish-calendar.c:337
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
 #, c-format
 msgid "Could not open %s:"
 msgstr "ç?¡æ³?é??å?? %sï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:97
+#: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "ç?¡æ³?é??å?? %sï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../plugins/publish-calendar/publish-calendar.c:117
+#: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "ç?¼ä½?å?° %s æ??ç?¼ç??é?¯èª¤ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:119
+#: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "ç?¼ä½?å?° %s å·²æ??å??çµ?æ??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:164
+#: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "æ??è¼? %s å¤±æ??ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:624
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "å??ç?¨(_E)"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "ç¢ºå®?è¦?ç§»é?¤é??å??ä½?ç½®ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:788
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
 msgid "Could not create publish thread."
 msgstr "ç?¡æ³?å»ºç«?ç?¼ä½?å?·è¡?ç·?ã??"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">ä½?ç½®</span>"
+#: ../plugins/publish-calendar/publish-calendar.c:1059
+msgid "_Publish Calendar Information"
+msgstr "ç?¼ä½?è¡?äº?æ??è³?è¨?(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">ä¾?æº?</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "è?ªè¨?ä½?ç½®"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
-msgstr ""
-"æ¯?æ?¥\n"
-"æ¯?é?±\n"
-"æ??å??(é??é??ã??å??ä½?ã??é?¸å?®)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "æ¯?å¤©"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "å??ç?¨(_E)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (é??ç?»å?¥)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr "æ??å?? (é??é??ã??å??ä½?ã??é?¸å?®)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "é?£æ?¥å? (_O):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "å?¬å?± FTP"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "ç?¼ä½?ä½?ç½®"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "ç?¼ä½?é »ç??(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"SSH\n"
-"å?¬ç?¨ FTP\n"
-"FTP (é??è¦?ç?»å?¥)\n"
-"Windows å?±ç?¨\n"
-"WebDAV (HTTP)\n"
-"å®?å?¨ç?? WebDAV (HTTPS)\n"
-"è?ªè¨?ä½?ç½®"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "å®?å?¨å¼? FTP (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "å®?å?¨å¼? WebDAV (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "æ??å??é¡?å??(_T):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "ä¾?æº?"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "æ??é??é?±æ??(_D):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "æ¯?é?±"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "Windows å??äº«"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "æª?æ¡?(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "å¯?ç¢¼(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "ç?¼ä½?ç?º(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "è¨?ä½?å¯?ç¢¼(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_U):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
-msgid ""
-"days\n"
-"weeks\n"
-"months"
-msgstr ""
-"æ?¥\n"
-"é?±\n"
-"æ??"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:32
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"iCal\n"
-"ç©ºé??/å¿?ç¢?"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
@@ -18202,38 +18532,14 @@ msgstr ""
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ç?¡æ³?ç?¼ä½?è¡?äº?æ??ï¼?è¡?äº?æ??å¾?ç«¯ç¨?å¼?å·²ä¸?å?å?¨"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:474
 msgid "New Location"
 msgstr "æ?°ç??ä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "Edit Location"
 msgstr "ç·¨è¼¯ä½?ç½®"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hello Python"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "Python å¤?æ??ç¨?å¼?è¼?å?¥ç¨?å¼?æ¸¬è©¦"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Python æ¸¬è©¦å¤?æ??ç¨?å¼?"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Python EPlugin è¼?å?¥ç¨?å¼?ç??æ¸¬è©¦å¤?æ??ç¨?å¼?ã??"
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "å?¯ä»¥è¼?å?¥å?¶ä»?ä»¥ Python å¯«ç??å??è?½ç??å¤?æ??ç¨?å¼?ã??"
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "Python è¼?å?¥å?¨"
-
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
@@ -18265,16 +18571,16 @@ msgstr "ç?å¾? SpamAssassin å?ç¨?åº?ä¸æ?·ï¼?çµ?çµ?å®?..."
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "å°?ç®¡è?³ SpamAssassin å¤±æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
 #, c-format
-msgid "SpamAssassin is not available."
-msgstr "SpamAssassin ç?¡æ³?ä½¿ç?¨ã??"
+msgid "SpamAssassin is not available. Please install it first."
+msgstr "SpamAssassin ç?¡æ³?ä½¿ç?¨ã??è«?å??å®?è£?å®?ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "é??æ??è®? SpamAssasin æ?´å?¯é? ï¼?ä½?é??åº¦è®?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "I_nclude remote tests"
 msgstr "å??å?«é? ç«¯æ¸¬è©¦(_N)"
 
@@ -18294,78 +18600,82 @@ msgstr "SpamAssassin é?¸é ?"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../plugins/save-calendar/csv-format.c:157
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:353
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:355
 msgid "Description List"
 msgstr "æ??è¿°æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "Categories List"
 msgstr "å??é¡?æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Comment List"
 msgstr "è¨»è§£æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Contact List"
 msgstr "é?£çµ¡äººæ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "Start"
 msgstr "é??å§?"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "End"
 msgstr "çµ?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "percent Done"
 msgstr "ï¼?å·²å®?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "URL"
 msgstr "ç¶²å??"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Attendees List"
 msgstr "å?°æ??è??æ¸?å?®"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Modified"
 msgstr "å·²ä¿®æ?¹"
 
-#: ../plugins/save-calendar/csv-format.c:523
+#: ../plugins/save-calendar/csv-format.c:520
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV æ ¼å¼?ç??é?²é??é?¸é ?(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:527
 msgid "Prepend a _header"
 msgstr "é ?å??è¦?ç?«æª?é (_H)"
 
-#: ../plugins/save-calendar/csv-format.c:539
+#: ../plugins/save-calendar/csv-format.c:536
 msgid "_Value delimiter:"
 msgstr "æ?¸å?¼å®?ç??ç¬¦(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:543
 msgid "_Record delimiter:"
 msgstr "ç´?é??å®?ç??ç¬¦(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:550
 msgid "_Encapsulate values with:"
 msgstr "ä»¥æ¤å°?è£?æ?¸å?¼(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:575
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "é??è??é??é??ç??æ?¸å?¼æ ¼å¼? (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar æ ¼å¼? (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "å?²å?é?¸å??ç??"
@@ -18374,50 +18684,38 @@ msgstr "å?²å?é?¸å??ç??"
 msgid "Save a calendar or task list to disk."
 msgstr "å°?è¡?äº?æ??æ??å·¥ä½?å?²å?è?³ç£?ç¢?ã??"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "å?²å?è?³ç£?ç¢?(_S)"
-
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:372
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "RDF æ ¼å¼? (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:104
+#: ../plugins/save-calendar/save-calendar.c:111
 msgid "_Format:"
 msgstr "æ ¼å¼?(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:172
 msgid "Select destination file"
 msgstr "é?¸å??ç?®ç??æª?æ¡?"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Quickly select a single calendar or task list for viewing."
-msgstr "å¿«é??é?¸å??è¦?æª¢è¦?ç??å?®ä¸?è¡?äº?æ??æ??å·¥ä½?æ¸?å?®ã??"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Select One Source"
-msgstr "é?¸æ??ä¸?å??ä¾?æº?"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "å?ªé¡¯ç¤ºé??å??è¡?äº?æ??(_O)"
+#: ../plugins/save-calendar/save-calendar.c:325
+msgid "Save the selected calendar to disk"
+msgstr "å°?é?¸å??ç??è¡?äº?æ??å?²å?è?³ç£?ç¢?"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "å?ªé¡¯ç¤ºæ¤å??å¿?é??æ¸?å?®(_O)"
+#: ../plugins/save-calendar/save-calendar.c:356
+msgid "Save the selected memo list to disk"
+msgstr "å°?é?¸å??ç??å??å¿?é??æ¸?å?®å?²å?è?³ç£?ç¢?"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "å?ªé¡¯ç¤ºæ¤å·¥ä½?æ¸?å?®(_O)"
+#: ../plugins/save-calendar/save-calendar.c:387
+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."
@@ -18427,17 +18725,18 @@ msgstr "æ??å¼?æ?¨å®?æ??å??å§?å¸³è??è¨å®?ã??"
 msgid "Setup Assistant"
 msgstr "è¨å®?å?©ç??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Evolution Setup Assistant"
 msgstr "Evolution è¨å®?å?©ç??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:92
 msgid "Welcome"
 msgstr "æ¡è¿?ä½¿ç?¨"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:97
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
@@ -18446,29 +18745,26 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??æ??é??ç¹¼çº?ã?? "
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Importing files"
-msgstr "å?¯å?¥æª?æ¡?"
-
-#: ../plugins/startup-wizard/startup-wizard.c:117
-#: ../shell/e-shell-importer.c:138
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../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:132
-#: ../shell/e-shell-importer.c:419
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "ä¾?è?ª %sï¼?"
 
-#: ../plugins/startup-wizard/startup-wizard.c:203
-#: ../shell/e-shell-importer.c:548
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:167
+msgid "Importing files"
+msgstr "å?¯å?¥æª?æ¡?"
+
+#: ../plugins/startup-wizard/startup-wizard.c:230
 msgid "Importing data."
 msgstr "å?¯å?¥è³?æ??ã??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:205
-#: ../shell/e-shell-importer.c:562
+#: ../plugins/startup-wizard/startup-wizard.c:232
 msgid "Please wait"
 msgstr "è«?ç¨?å??"
 
@@ -18490,25 +18786,27 @@ msgid "F_all back to threading messages by subject"
 msgstr "é??å??å?°ä¾?ä¸»æ?¨ç??ç?¸é??é?µä»¶(_A)"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
 msgstr "ä½¿ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå?/æ?¸å?¼çµ?æ¸?å?®ã??"
 
-#: ../plugins/templates/templates.c:601
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "å?ºæ?¼è??ç¨¿ç??ç¯?æ?¬å¤?æ??ç¨?å¼?"
+
+#: ../plugins/templates/templates.c:617
+msgid "No Title"
 msgstr "æ²?æ??æ¨?é¡?"
 
-#: ../plugins/templates/templates.c:709
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "å?²å?ç?ºç¯?æ?¬(_T)"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "å?²å?ç?ºç¯?æ?¬"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "å?ºæ?¼è??ç¨¿ç??ç¯?æ?¬å¤?æ??ç¨?å¼?"
-
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 msgstr "è§£ç¢¼ Microsoft Outlook ç?? TNEF (winmail.dat) é??ä»¶ã??"
@@ -18525,27 +18823,27 @@ msgstr "è¡?å?§ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸é¡¯ç¤º vCardã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:159
-#: ../plugins/vcard-inline/vcard-inline.c:243
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "Show Full vCard"
 msgstr "é¡¯ç¤ºå®?æ?´ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:162
+#: ../plugins/vcard-inline/vcard-inline.c:163
 msgid "Show Compact vCard"
 msgstr "é¡¯ç¤ºç²¾ç°¡ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:222
+#: ../plugins/vcard-inline/vcard-inline.c:224
 msgid "There is one other contact."
 msgstr "é??æ??é?£çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:231
+#: ../plugins/vcard-inline/vcard-inline.c:233
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "é??æ?? %d å??å?¶ä»?é?£çµ¡äººã??"
 msgstr[1] "é??æ?? %d å??å?¶ä»?é?£çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:252
+#: ../plugins/vcard-inline/vcard-inline.c:254
 msgid "Save in Address Book"
 msgstr "å?å?¥é??è¨?é??"
 
@@ -18569,22 +18867,6 @@ msgstr "ç¶²å??:"
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfM_atch (é??ä½¿ç?¨ Apache < 2.2.8)"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Evolution Shell è¨å®?å·¥å» "
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution æ¸¬è©¦"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution æ¸¬è©¦å??ä»¶"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "é©?è?ä»£ç??ä¼ºæ??å?¨é?£ç·?"
@@ -18602,317 +18884,437 @@ msgid "Default sidebar width"
 msgstr "é ?è¨è³?è¨?æ?¹å¡?å??å¯¬åº¦"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Default window X coordinate"
+msgstr "é ?è¨è¦?çª? X å??æ¨?"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid "Default window Y coordinate"
+msgstr "é ?è¨è¦?çª? Y å??æ¨?"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "é ?è¨è¦?çª?é«?åº¦"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "é ?è¨è¦?çª?ç??æ??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "é ?è¨è¦?çª?å¯¬åº¦"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "ç?¶å?å??ç¶²é??ç¶²è·¯ä¸?ç?? HTTP/ å®?å?¨å¼? HTTP æ??å??ç?¨ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy host name"
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy password"
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨å¯?ç¢¼"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy port"
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨é?£æ?¥å? "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy username"
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨ä½¿ç?¨è??å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "å??å??æ??é ?è¨é¡¯ç¤ºç??å??ä»¶ç?¸é?? ID æ??å?¥å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr "å¦?æ??ç?º trueï¼?å°?ä»£ç??ä¼ºæ??å?¨ç??é?£ç·?å°±é??è¦?é©?è?ã??å?¶ä¸ä½¿ç?¨è??å??ç¨±æ??å¾? GConf ç??ã??apps/evolution/shell/network_config/authentication_userã??é?µå?¼å??å¾?ï¼?è??å¯?ç¢¼æ??å¾? gnome-keyring æ??ã??~/.gnome2_private/Evolutionã??ç??å¯?ç¢¼æª?æ¡?å??å¾?ã??"
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"å¦?æ??ç?º trueï¼?å°?ä»£ç??ä¼ºæ??å?¨ç??é?£ç·?å°±é??è¦?é©?è?ã??å?¶ä¸ä½¿ç?¨è??å??ç¨±æ??å¾? GConf ç??ã??apps/"
+"evolution/shell/network_config/authentication_userã??é?µå?¼å??å¾?ï¼?è??å¯?ç¢¼æ??å¾? "
+"gnome-keyring æ??ã??~/.gnome2_private/Evolutionã??ç??å¯?ç¢¼æª?æ¡?å??å¾?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Initial attachment view"
 msgstr "å??å§?é??ä»¶æª¢è¦?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Initial file chooser folder"
 msgstr "æª?æ¡?é?¸æ??å°?è©±ç??ç??å??å§?è³?æ??å¤¾"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser å°?è©±ç??ç??å??å§?è³?æ??å¤¾ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
 msgstr "é??ä»¶å·¥å?·å??å??ä»¶ç??å??å§?æª¢è¦?ã??ã??0ã??æ?¯å??ç¤ºï¼?ã??1ã??æ?¯æ¸?å?®æª¢è¦?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "ä¸?æ¬¡å??ç´?ç??çµ?æ??ç??æ?¬"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "è¦?å??æ¥è?³ç£?ç¢?ç??è³?æ??å¤¾ï¼?å?¶è·¯å¾?æ¸?å?® (ä¾?é?¢ç·?ä½¿ç?¨)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ç??ä¸»æ©?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨æ??é?²è¡?èª?è?ç??å¯?ç¢¼ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "SOCKS ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "SOCKS ä»£ç??ä¼ºæ??å?¨é??è¨?å? "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "å®?å?¨å¼? HTTP ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
 msgstr "å®?å?¨å¼? HTTP ä»£ç??ä¼ºæ??å?¨é??è¨?å? "
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
-msgstr "é?¸æ??ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?ã??æ?¯æ?´ç??æ?¸å?¼æ?? 0ã?? 1ã?? 2ã?? å?? 3ï¼?å??å?¥ä»£è¡¨ã??ä½¿ç?¨ç³»çµ±è¨å®?å?¼ã??ã??ã??ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ã??ã??ã??ä½¿ç?¨æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??å??ã??ä½¿ç?¨å?¨ autoconfig url ä¸æ??ä¾?ç??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??ã??"
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+"é?¸æ??ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?ã??æ?¯æ?´ç??æ?¸å?¼æ?? 0ã?? 1ã?? 2ã?? å?? 3ï¼?å??å?¥ä»£è¡¨ã??ä½¿ç?¨ç³»çµ±è¨å®?"
+"å?¼ã??ã??ã??ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ã??ã??ã??ä½¿ç?¨æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??å??ã??ä½¿ç?¨å?¨ autoconfig "
+"url ä¸æ??ä¾?ç??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "é¡¯ç¤ºå?´é??æ¬?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "å¿½ç?¥é??ç?¼è¦å??å°?è©±ç??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-#: ../shell/main.c:489
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:321
 msgid "Start in offline mode"
 msgstr "ä»¥é?¢ç·?æ¨¡å¼?å??å??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "ç??æ??å??è¨ç?ºé¡¯ç¤º"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
-msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "Evolution ç??çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"Evolution ç??çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The default X coordinate for the main window."
+msgstr "ä¸»è¦?çª?ç??é ?è¨ X å??æ¨?ã??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The default Y coordinate for the main window."
+msgstr "ä¸»è¦?çª?ç??é ?è¨ Y å??æ¨?ã??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
 msgstr "ä¸»è¦?çª?ç??é ?è¨é«?åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default width for the main window, in pixels."
 msgstr "ä¸»è¦?çª?ç??é ?è¨å¯¬åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
 msgstr "è³?è¨?æ?¹å¡?å??ç??é ?è¨å¯¬åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "ä¸?æ¬¡å??ç´?ç?? Evolution çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"ä¸?æ¬¡å??ç´?ç?? Evolution çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?"
+"ã??2.6.0ã??) ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
 msgstr "ç?¨å?¨å®?å?¨å¼? HTTP ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr "socks ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
-msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/http_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/http_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?"
+"å? ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
-msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/secure_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
+#: ../shell/apps_evolution_shell.schemas.in.h:46
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/secure_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??"
+"è¨?å? ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
-msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/socks_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/socks_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?"
+"å? ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "text", "icons", "both", "toolbar", "toolbar"
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
-msgstr "è¦?çª?æ??é??ç??é¢¨æ ¼ã??å?¯ä»¥æ?¯ã??textã??(æ??å?)ã??ã??iconsã??(å??ç¤º)ã??ã??bothã??(å?©è??)ã??ã??toolbarã??(å·¥å?·å??)ã??å¦?æ??è¨ç?ºã??toolbarã??(å·¥å?·å??)ï¼?æ??é??ç??é¢¨æ ¼æ??ä¾? GNOME å·¥å?·å??è¨å®?å?¼æ±ºå®?ã??"
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+"è¦?çª?æ??é??ç??é¢¨æ ¼ã??å?¯ä»¥æ?¯ã??textã??(æ??å?)ã??ã??iconsã??(å??ç¤º)ã??ã??bothã??(å?©è??)ã??"
+"ã??toolbarã??(å·¥å?·å??)ã??å¦?æ??è¨ç?ºã??toolbarã??(å·¥å?·å??)ï¼?æ??é??ç??é¢¨æ ¼æ??ä¾? GNOME å·¥å?·å??"
+"è¨å®?å?¼æ±ºå®?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr "é??å??é?µå?¼å??å?«äº?è¦?ç?´æ?¥é?£ç·?ï¼?ä¸?é??é??ä»£ç??ä¼ºæ??å?¨ï¼?å¦?æ??æ??ä½¿ç?¨ï¼?ç??ä¸»æ©?ã??æ?¸å?¼å?¯ä»¥ç?ºä¸»æ©?å??ç¨±ã??ç¶²å??ï¼?é??é ä½¿ç?¨è?¬ç?¨å?å??å¦? *.foo.comï¼?ã??IP ä½?å??ï¼?IPv4 å?? IPv6 ç??å?¯ï¼?æ??å¸¶æ??å?ç¶²è·¯é?®ç½©ç??ä½?å??ï¼?å??æ?¯ 192.168.0.0/24ï¼?ã??"
+#: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"é??å??é?µå?¼å??å?«äº?è¦?ç?´æ?¥é?£ç·?ï¼?ä¸?é??é??ä»£ç??ä¼ºæ??å?¨ï¼?å¦?æ??æ??ä½¿ç?¨ï¼?ç??ä¸»æ©?ã??æ?¸å?¼å?¯ä»¥ç?ºä¸»"
+"æ©?å??ç¨±ã??ç¶²å??ï¼?é??é ä½¿ç?¨è?¬ç?¨å?å??å¦? *.foo.comï¼?ã??IP ä½?å??ï¼?IPv4 å?? IPv6 ç??å?¯ï¼?æ??"
+"å¸¶æ??å?ç¶²è·¯é?®ç½©ç??ä½?å??ï¼?å??æ?¯ 192.168.0.0/24ï¼?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "å·¥å?·å??å?¯ä»¥ç??å?°"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr "æ??ä¾?ä»£ç??ä¼ºæ??å?¨çµ?æ??ç??ç¶²å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "ä½¿ç?¨ HTTP ä»£ç??ä¼ºæ??å?¨æ??ç?¨ä¾?é©?è?ç??ä½¿ç?¨è??å??ç¨±ã??"
 
 # zh_HK: msgstr "Evolution æ?¯å?¦ä»¥é?¢ç·?æ¨¡å¼?å??å??å??ä»£ç·?ä¸?æ¨¡å¼?ã??"
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution æ?¯å?¦ä»¥é?¢ç·?æ¨¡å¼?å??å??å??ä»£ç·?ä¸?æ¨¡å¼?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "è¦?çª?æ?¯å?¦å?¯ä»¥æ??å¤§å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°å?´é??æ¬?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "æ?¯å?¦é¡¯ç¤ºç??æ??å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°å·¥å?·å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:59
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "æ?¯å?¦ç??ç?¥ Evulution é??ç?¼ç??æ?¬ç??è¦å??å°?è©±ç??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "è¦?çª?æ??é??é¢¨æ ¼"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "è¦?çª?æ??é??æ?¯å?¯è¦?ç??"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>ä½?ç?¨ä¸ç??é?£ç·?</b>"
+#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+msgid "Searches"
+msgstr "æ??å°?"
+
+#: ../shell/e-shell-content.c:619
+msgid "Save Search"
+msgstr "å?²å?æ??å°?çµ?æ??"
+
+#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "ä½?ç?¨ä¸ç??é?£ç·?"
+#. 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:687
+msgid "Sho_w:"
+msgstr "é¡¯ç¤º(_W):"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "æ??ã??ç¢ºå®?ã??é??é??é??äº?é?£ç·?ä»¥é?¢ç·?"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:714
+msgid "Sear_ch:"
+msgstr "æ??å°?(_C):"
 
-#: ../shell/e-shell-importer.c:128
-msgid "Choose the type of importer to run:"
-msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:769
+msgid "i_n"
+msgstr "æ?¼(_N)"
 
-#: ../shell/e-shell-importer.c:131
-msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
-msgstr "é?¸å??è¦?å?¯å?¥ Evolution ç??æª?æ¡?ï¼?ä¸¦ä¸?å?¨æ¸?å?®å?§é?¸å??æª?æ¡?é¡?å??ã??"
+#: ../shell/e-shell-switcher.c:448
+msgid "Toolbar Style"
+msgstr "å·¥å?·å??æ¨£å¼?"
 
-#: ../shell/e-shell-importer.c:135
-msgid "Choose the destination for this import"
-msgstr "é?¸æ??æ¤è¼¸å?¥ç??ç?®ç??å?°"
+#: ../shell/e-shell-switcher.c:449
+msgid "The switcher's toolbar style"
+msgstr "å??æ??ç¨?å¼?å·¥å?·å??æ¨£å¼?"
 
-#: ../shell/e-shell-importer.c:141
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
+#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:737
+msgid "Toolbar Visible"
+msgstr "å·¥å?·å??å?¯è¦?æ?§"
+
+#: ../shell/e-shell-switcher.c:466
+msgid "Whether the switcher is visible"
+msgstr "å??æ??ç¨?å¼?æ?¯å?¦ç?ºå?¯è¦?"
+
+#: ../shell/e-shell-utils.c:220
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf)"
+
+#: ../shell/e-shell-utils.c:222
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
+
+#: ../shell/e-shell-utils.c:243
+msgid "All Files (*)"
+msgstr "æ??æ??æª?æ¡? (*)"
+
+#: ../shell/e-shell-view.c:604
+msgid "Switcher Action"
+msgstr "å??æ??ç¨?å¼?å??ä½?"
+
+#: ../shell/e-shell-view.c:605
+msgid "The switcher action for this shell view"
 msgstr ""
-"Evolution å·²ç¶?æª¢æ?¥å¾?ä»¥ä¸?æ??ç?¨ç¨?å¼?è¼¸å?¥ç??\n"
-"è¨å®?å?¼ï¼?Pineã??Netscapeã??Elmã??iCalendarã??æ?¾ä¸?å?°å?¯ä»¥\n"
-"è¼¸å?¥ç??è¨å®?å?¼ã??å¦?æ??æ?¨æ?³\n"
-"å??è©¦ä¸?æ¬¡ï¼?è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??æ??é??ã??\n"
 
-#: ../shell/e-shell-importer.c:295
-msgid "F_ilename:"
-msgstr "æª?æ¡?å??ç¨±(_I):"
+#: ../shell/e-shell-view.c:620
+msgid "Page Number"
+msgstr "é ?ç¢¼"
 
-#: ../shell/e-shell-importer.c:300
-msgid "Select a file"
-msgstr "é?¸æ??ä¸?å??æª?æ¡?"
+#: ../shell/e-shell-view.c:621
+msgid "The notebook page number of the shell view"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:309
-msgid "File _type:"
-msgstr "æª?æ¡?é¡?å??(_T):"
+#: ../shell/e-shell-view.c:637
+msgid "Search Rule"
+msgstr "æ??å°?è¦?å??"
 
-#: ../shell/e-shell-importer.c:357
-msgid "Import data and settings from _older programs"
-msgstr "å¾?è??ç¨?å¼?è¼¸å?¥è³?æ??å??è¨å®?å?¼(_O)"
+#: ../shell/e-shell-view.c:638
+msgid "Criteria for the current search results"
+msgstr "ç?®å??ç??æ??å°?çµ?æ??ç??æ¢?ä»¶"
 
-#: ../shell/e-shell-importer.c:360
-msgid "Import a _single file"
-msgstr "å?¯å?¥å?®ä¸?æª?æ¡?(_S)"
+#: ../shell/e-shell-view.c:653
+#, fuzzy
+msgid "The EShellBackend for this shell view"
+msgstr "é¡¯ç¤ºæ??é??æ?¬é??æ?²ç??èªªæ??æ??ä»¶"
 
-#: ../shell/e-shell-importer.c:743
-msgid "_Import"
-msgstr "å?¯å?¥(_I)"
+#: ../shell/e-shell-view.c:668
+#, fuzzy
+msgid "Shell Content Widget"
+msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
 
-#: ../shell/e-shell-settings-dialog.c:312
-msgid "Evolution Preferences"
-msgstr "Evolution å??å¥½è¨å®?"
+#: ../shell/e-shell-view.c:669
+msgid "The content widget appears in a shell window's right pane"
+msgstr ""
 
-#. To translators: This is the window title and %s is the
-#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47
-#: ../shell/e-shell-window.c:324
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+#: ../shell/e-shell-view.c:685
+#, fuzzy
+msgid "Shell Sidebar Widget"
+msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
 
-#: ../shell/e-shell-window-commands.c:69
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "ç³»çµ±ä¼¼ä¹?æ²?æ??å®?è£? GNOME Pilot å·¥å?·ã??"
+#: ../shell/e-shell-view.c:686
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:78
-#, c-format
-msgid "Error executing %s. (%s)"
-msgstr "å?·è¡? %s ç?¼ç??é?¯èª¤ã??(%s)"
+#: ../shell/e-shell-view.c:701
+#, fuzzy
+msgid "Shell Taskbar Widget"
+msgstr "å??å??é ?è¦½è¦?çª?å??ä»¶"
+
+#: ../shell/e-shell-view.c:702
+msgid "The taskbar widget appears at the bottom of a shell window"
+msgstr ""
+
+#: ../shell/e-shell-view.c:717
+#, fuzzy
+msgid "Shell Window"
+msgstr "è¦?çª?é«?åº¦"
+
+#: ../shell/e-shell-view.c:718
+msgid "The window to which the shell view belongs"
+msgstr ""
+
+#: ../shell/e-shell-view.c:734
+msgid "The key file holding widget state data"
+msgstr "å?æ?¾è¦?çª?å??ä»¶ç??æ??è³?æ??ç??è¨å®?é?µæª?æ¡?"
 
-#: ../shell/e-shell-window-commands.c:135
-msgid "Bug buddy is not installed."
-msgstr "æ?ªå®?è£?è¨è¨?é?¯èª¤é?¨ä»½ã??"
+#: ../shell/e-shell-view.c:749
+#, fuzzy
+msgid "The title of the shell view"
+msgstr "é¡¯ç¤ºä¸»å·¥å?·å??"
 
-#: ../shell/e-shell-window-commands.c:138
-msgid "Bug buddy could not be run."
-msgstr "ç?¡æ³?å?·è¡? Bug buddyã??"
+#: ../shell/e-shell-view.c:763
+msgid "Current View ID"
+msgstr "ç?®å??ç??æª¢è¦? ID"
+
+#: ../shell/e-shell-view.c:764
+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.
-#: ../shell/e-shell-window-commands.c:938
+#: ../shell/e-shell-window-actions.c:644
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
@@ -18923,133 +19325,420 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-commands.c:949
+#: ../shell/e-shell-window-actions.c:655
 msgid "Evolution Website"
 msgstr "Evolution ç¶²ç«?"
 
+#: ../shell/e-shell-window-actions.c:1223
+msgid "Bug Buddy is not installed."
+msgstr "å°?æ?ªå®?è£? Bug Buddyã??"
+
+#: ../shell/e-shell-window-actions.c:1225
+msgid "Bug Buddy could not be run."
+msgstr "ç?¡æ³?å?·è¡? Bug Buddyã??"
+
+#: ../shell/e-shell-window-actions.c:1327
+msgid "GNOME Pilot is not installed."
+msgstr "å°?æ?ªå®?è£? GNOME Pilotã??"
+
+#: ../shell/e-shell-window-actions.c:1329
+msgid "GNOME Pilot could not be run."
+msgstr "ç?¡æ³?å?·è¡? GNOME Pilotã??"
+
+#: ../shell/e-shell-window-actions.c:1423
+msgid "Show information about Evolution"
+msgstr "é¡¯ç¤º Evolution ç?¸é??è³?è¨?"
+
+#: ../shell/e-shell-window-actions.c:1428
+msgid "_Close Window"
+msgstr "é??é??è¦?çª?(_C)"
+
+#: ../shell/e-shell-window-actions.c:1435
+msgid "_Contents"
+msgstr "å?§å®¹(_C)"
+
+#: ../shell/e-shell-window-actions.c:1437
+msgid "Open the Evolution User Guide"
+msgstr "é??å?? Evolution ä½¿ç?¨è??æ??å??"
+
+#: ../shell/e-shell-window-actions.c:1463
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
+
+#: ../shell/e-shell-window-actions.c:1465
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "é??å??å¸¸è¦?å??é¡?(FAQ)ç¶²é ?"
+
+#: ../shell/e-shell-window-actions.c:1470
+msgid "_Forget Passwords"
+msgstr "é?ºå¿?å¯?ç¢¼(_F)"
+
+#: ../shell/e-shell-window-actions.c:1472
+msgid "Forget all remembered passwords"
+msgstr "å¿?è¨?æ??æ??è¨?æ?¶ç??å¯?ç¢¼"
+
+#: ../shell/e-shell-window-actions.c:1477
+msgid "I_mport..."
+msgstr "å?¯å?¥(_M)..."
+
+#: ../shell/e-shell-window-actions.c:1479
+msgid "Import data from other programs"
+msgstr "å?¯å?¥å?¶ä»?ç¨?å¼?ç??è³?æ??"
+
+#: ../shell/e-shell-window-actions.c:1484
+msgid "New _Window"
+msgstr "é??æ?°è¦?çª?(_W)"
+
+#: ../shell/e-shell-window-actions.c:1486
+msgid "Create a new window displaying this view"
+msgstr "å»ºç«?ä¸?å??æ?°ç??è¦?çª?ä¾?é¡¯ç¤ºé??å??æª¢è¦?"
+
+#: ../shell/e-shell-window-actions.c:1500
+msgid "Configure Evolution"
+msgstr "è¨å®? Evolution"
+
+#: ../shell/e-shell-window-actions.c:1505
+msgid "_Quick Reference"
+msgstr "å¿«é??å??å¥½è¨å®?(_Q)"
+
+#: ../shell/e-shell-window-actions.c:1507
+msgid "Show Evolution's shortcut keys"
+msgstr "é¡¯ç¤º Evolution ç??æ?·å¾?é?µ"
+
+#: ../shell/e-shell-window-actions.c:1514
+msgid "Exit the program"
+msgstr "é?¢é??é??å??ç¨?å¼?"
+
+#: ../shell/e-shell-window-actions.c:1519
+msgid "_Advanced Search..."
+msgstr "é?²é??æ??å°?(_A)..."
+
+#: ../shell/e-shell-window-actions.c:1521
+msgid "Construct a more advanced search"
+msgstr "å»ºæ§?æ?´é?²é??ç??æ??å°?"
+
+#: ../shell/e-shell-window-actions.c:1528
+msgid "Clear the current search parameters"
+msgstr "æ¸?é?¤ç?®å??ç??æ??å°?å??æ?¸"
+
+#: ../shell/e-shell-window-actions.c:1533
+msgid "_Edit Saved Searches..."
+msgstr "ç·¨è¼¯å?²å?ç??æ??å°?çµ?æ??(_E)..."
+
+#: ../shell/e-shell-window-actions.c:1535
+msgid "Manage your saved searches"
+msgstr "ç®¡ç??æ?¨å·²å?²å?ç??æ??å°?"
+
+#: ../shell/e-shell-window-actions.c:1542
+msgid "Click here to change the search type"
+msgstr "æ??é??è£¡ä»¥æ?¹è®?æ??å°?é¡?å??"
+
+#: ../shell/e-shell-window-actions.c:1547
+msgid "_Find Now"
+msgstr "ç«?å?³æ??å°?(_F)"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1549
+msgid "Execute the current search parameters"
+msgstr "å?·è¡?ç?®å??ç??æ??å°?å??æ?¸"
+
+#: ../shell/e-shell-window-actions.c:1554
+msgid "_Save Search..."
+msgstr "å?²å?æ??å°?çµ?æ??(_S)..."
+
+#: ../shell/e-shell-window-actions.c:1556
+msgid "Save the current search parameters"
+msgstr "å?²å?ç?®å??ç??æ??å°?å??æ?¸"
+
+#: ../shell/e-shell-window-actions.c:1568
+msgid "Send / _Receive"
+msgstr "å?³é??/æ?¥æ?¶(_R)"
+
+#: ../shell/e-shell-window-actions.c:1570
+msgid "Send queued items and retrieve new items"
+msgstr "å?³é??å¾?é??ç??é ?ç?®ä¸¦æ?¥æ?¶æ?°ç??é ?ç?®"
+
+#: ../shell/e-shell-window-actions.c:1575
+msgid "Submit _Bug Report..."
+msgstr "å?³é??é?¯èª¤å ±å??(_B)..."
+
+#: ../shell/e-shell-window-actions.c:1577
+msgid "Submit a bug report using Bug Buddy"
+msgstr "ä½¿ç?¨ Bug Buddy é??å?ºé?¯èª¤å ±å??ã??"
+
+#: ../shell/e-shell-window-actions.c:1582
+msgid "GNOME Pilot _Synchronization..."
+msgstr "GNOME Pilot å??æ¥å??(_S)..."
+
+#: ../shell/e-shell-window-actions.c:1584
+msgid "Set up GNOME Pilot configuration"
+msgstr "è¨å®? GNOME Pilot çµ?æ??"
+
+#: ../shell/e-shell-window-actions.c:1589
+msgid "_Work Offline"
+msgstr "é?¢ç·?å·¥ä½?(_W)"
+
+#: ../shell/e-shell-window-actions.c:1591
+msgid "Put Evolution into offline mode"
+msgstr "è®? Evolution é?²å?¥é?¢ç·?æ¨¡å¼?"
+
 # zh_HK: msgstr "ç·?ä¸?å·¥ä½?(_W)"
-#: ../shell/e-shell-window-commands.c:1163
+#: ../shell/e-shell-window-actions.c:1596
 msgid "_Work Online"
 msgstr "ç·?ä¸?å·¥ä½?(_W)"
 
-#: ../shell/e-shell-window-commands.c:1176
-#: ../ui/evolution.xml.h:57
-msgid "_Work Offline"
-msgstr "é?¢ç·?å·¥ä½?(_W)"
+# zh_HK: msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
+#: ../shell/e-shell-window-actions.c:1598
+msgid "Put Evolution into online mode"
+msgstr "è®? Evolution é?²å?¥ä¸?ç·?æ¨¡å¼?"
 
-#: ../shell/e-shell-window-commands.c:1189
-msgid "Work Offline"
-msgstr "é?¢ç·?å·¥ä½?"
+#: ../shell/e-shell-window-actions.c:1626
+msgid "Lay_out"
+msgstr "ä½?å±?(_O)"
 
-# zh_HK: msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
-#: ../shell/e-shell-window.c:372
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
+#: ../shell/e-shell-window-actions.c:1633
+msgid "_New"
+msgstr "æ?°å¢?(_N)"
 
-#: ../shell/e-shell-window.c:379
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution æ£å?¨é?¢ç·?ç??ç¨?åº?ä¸ã??"
+#: ../shell/e-shell-window-actions.c:1640
+msgid "_Search"
+msgstr "æ??å°?(_S)"
 
-# zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
-#: ../shell/e-shell-window.c:386
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
-msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+#: ../shell/e-shell-window-actions.c:1647
+msgid "_Switcher Appearance"
+msgstr "å??æ??å¤?è§?(_S)"
+
+#: ../shell/e-shell-window-actions.c:1661
+msgid "_Window"
+msgstr "è¦?çª?(_O)"
+
+#: ../shell/e-shell-window-actions.c:1690
+msgid "Show Side _Bar"
+msgstr "é¡¯ç¤ºå?´é??æ¬?(_B)"
 
-#: ../shell/e-shell-window.c:778
+#: ../shell/e-shell-window-actions.c:1692
+msgid "Show the side bar"
+msgstr "é¡¯ç¤ºå?´é??å??"
+
+#: ../shell/e-shell-window-actions.c:1698
+msgid "Show _Buttons"
+msgstr "é¡¯ç¤ºæ??é??(_B)"
+
+#: ../shell/e-shell-window-actions.c:1700
+msgid "Show the switcher buttons"
+msgstr "é¡¯ç¤ºå??æ??ç¨?å¼?æ??é??"
+
+#: ../shell/e-shell-window-actions.c:1706
+msgid "Show _Status Bar"
+msgstr "é¡¯ç¤ºç??æ??å??(_S)"
+
+#: ../shell/e-shell-window-actions.c:1708
+msgid "Show the status bar"
+msgstr "é¡¯ç¤ºç??æ??å??"
+
+#: ../shell/e-shell-window-actions.c:1714
+msgid "Show _Tool Bar"
+msgstr "é¡¯ç¤ºå·¥å?·å??(_T)"
+
+#: ../shell/e-shell-window-actions.c:1716
+msgid "Show the tool bar"
+msgstr "é¡¯ç¤ºå·¥å?·å??"
+
+#: ../shell/e-shell-window-actions.c:1738
+msgid "_Icons Only"
+msgstr "å?ªæ??å??ç¤º(_I)"
+
+#: ../shell/e-shell-window-actions.c:1740
+msgid "Display window buttons with icons only"
+msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??å??ç¤º"
+
+#: ../shell/e-shell-window-actions.c:1745
+msgid "_Text Only"
+msgstr "å?ªæ??æ??å?(_T)"
+
+#: ../shell/e-shell-window-actions.c:1747
+msgid "Display window buttons with text only"
+msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??æ??å?"
+
+#: ../shell/e-shell-window-actions.c:1752
+msgid "Icons _and Text"
+msgstr "å??ç¤ºå??æ??å?(_A)"
+
+#: ../shell/e-shell-window-actions.c:1754
+msgid "Display window buttons with icons and text"
+msgstr "é¡¯ç¤ºè¦?çª?æ??é??ç??å??ç¤ºå??æ??å?"
+
+#: ../shell/e-shell-window-actions.c:1759
+msgid "Tool_bar Style"
+msgstr "å·¥å?·å??é¢¨æ ¼(_B)"
+
+#: ../shell/e-shell-window-actions.c:1761
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "ä½¿ç?¨æ¡?é?¢å·¥å?·å??è¨å®?å?¼é¡¯ç¤ºè¦?çª?æ??é??"
+
+#: ../shell/e-shell-window-actions.c:1769
+msgid "Define Views..."
+msgstr "å®?ç¾©æª¢è¦?..."
+
+#: ../shell/e-shell-window-actions.c:1771
+msgid "Create or edit views"
+msgstr "å»ºç«?æ??ç·¨è¼¯æª¢è¦?(_C)"
+
+#: ../shell/e-shell-window-actions.c:1776
+msgid "Save Custom View..."
+msgstr "å?²å?è?ªè¨?æª¢è¦?..."
+
+#: ../shell/e-shell-window-actions.c:1778
+msgid "Save current custom view"
+msgstr "å?²å?ç?®å??ç??è?ªè¨?æª¢è¦?"
+
+#: ../shell/e-shell-window-actions.c:1785
+msgid "C_urrent View"
+msgstr "ç?®å??æª¢è¦?(_U)"
+
+#: ../shell/e-shell-window-actions.c:1795
+msgid "Custom View"
+msgstr "è?ªè¨?æª¢è¦?"
+
+#: ../shell/e-shell-window-actions.c:1797
+msgid "Current view is a customized view"
+msgstr "ç?®å??ç??æª¢è¦?æ?¹å¼?æ?¯è?ªè¨?ç??æª¢è¦?"
+
+#: ../shell/e-shell-window-actions.c:1807
+msgid "Change the page settings for your current printer"
+msgstr "ä¿®æ?¹ç?®å??å?°è¡¨æ©?ç??é ?é?¢å??å?°è¨å®?"
+
+#: ../shell/e-shell-window-actions.c:2127
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ??è?³ %s"
 
-#: ../shell/e-shell.c:634
-msgid "Unknown system error."
-msgstr "ä¸?æ??ç??ç³»çµ±é?¯èª¤ã??"
+#: ../shell/e-shell-window-actions.c:2337
+msgid "Execute these search parameters"
+msgstr "å?·è¡?é??äº?æ??å°?å??æ?¸"
 
-#: ../shell/e-shell.c:832
-#: ../shell/e-shell.c:833
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:552
 #, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/e-shell.c:1251
-#: ../widgets/misc/e-cell-date-edit.c:320
-msgid "OK"
-msgstr "ç¢ºå®?"
+#: ../shell/e-shell-window.c:360
+msgid "New"
+msgstr "æ?°å¢?"
 
-#: ../shell/e-shell.c:1253
-msgid "Invalid arguments"
-msgstr "ç?¡æ??ç??å¼?æ?¸"
+#: ../shell/e-shell-window.c:613
+#, fuzzy
+msgid "Active Shell View"
+msgstr "é¡¯ç¤ºä¸»å·¥å?·å??"
 
-#: ../shell/e-shell.c:1255
-msgid "Cannot register on OAF"
-msgstr "ä¸?è?½æ?¼ OAF è¨»å??"
+#: ../shell/e-shell-window.c:614
+#, fuzzy
+msgid "Name of the active shell view"
+msgstr "æª¢è¦?å?¨ <b>Google ç¨?å¼?ç¢¼æ??å°?</b> ä¸ç?? <i>%(name)s</i>"
 
-#: ../shell/e-shell.c:1257
-msgid "Configuration Database not found"
-msgstr "æ?¾ä¸?å?°çµ?æ??è³?æ??åº«"
+#: ../shell/e-shell-window.c:629
+#, fuzzy
+msgid "The shell window's EFocusTracker"
+msgstr "é??å§?æ??è¦?çª?ç??ä½?ç½®"
 
-#: ../shell/e-user-creatable-items-handler.c:674
-#: ../shell/e-user-creatable-items-handler.c:684
-#: ../shell/e-user-creatable-items-handler.c:689
-msgid "New"
-msgstr "æ?°å¢?"
+#: ../shell/e-shell-window.c:643 ../shell/e-shell.c:772
+msgid "Geometry"
+msgstr "ä½?ç½®å¤§å°?"
 
-#: ../shell/test/evolution-test-component.c:103
-msgid "New Test"
-msgstr "æ?°æ¸¬è©¦"
+#: ../shell/e-shell-window.c:644 ../shell/e-shell.c:773
+msgid "Initial window geometry string"
+msgstr "è¦?çª?å??å§?å¤§å°?å?ä¸²"
 
-#: ../shell/test/evolution-test-component.c:104
-msgctxt "New"
-msgid "_Test"
-msgstr "æ¸¬è©¦(_T)"
+#: ../shell/e-shell-window.c:659
+msgid "Safe Mode"
+msgstr "å®?å?¨æ¨¡å¼?"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "Create a new test item"
-msgstr "å»ºç«?æ?°ç??æ¸¬è©¦é ?ç?®"
+#: ../shell/e-shell-window.c:660
+#, fuzzy
+msgid "Whether the shell window is in safe mode"
+msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "æ??ã??å?¯å?¥ã??é??å§?å°?æª?æ¡?å?¯å?¥å?° Evolutionã??"
+#: ../shell/e-shell-window.c:691
+msgid "Sidebar Visible"
+msgstr "å?´é??æ¬?å?¯è¦?æ?§"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Evolution å?¯å?¥å?©ç??"
+#: ../shell/e-shell-window.c:692
+#, fuzzy
+msgid "Whether the shell window's side bar is visible"
+msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "è¼¸å?¥æª?æ¡?"
+#: ../shell/e-shell-window.c:706
+msgid "Switcher Visible"
+msgstr "å??æ??ç¨?å¼?å?¯è¦?æ?§"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "è¼¸å?¥ä½?ç½®"
+#: ../shell/e-shell-window.c:707
+#, fuzzy
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "è¼¸å?¥å?¨é¡?å??"
+#: ../shell/e-shell-window.c:722
+msgid "Taskbar Visible"
+msgstr "å·¥ä½?å??å?¯è¦?æ?§"
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "é?¸æ??è¦?å?¯å?¥ç??è³?è¨?"
+#: ../shell/e-shell-window.c:723
+#, fuzzy
+msgid "Whether the shell window's task bar is visible"
+msgstr "æ?¯å?¦é¡¯ç¤ºç??æ??å??ã??"
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "é?¸å??æª?æ¡?"
+#: ../shell/e-shell-window.c:738
+#, fuzzy
+msgid "Whether the shell window's tool bar is visible"
+msgstr "æ?¯å?¦å?¯ä»¥ç??å?°è¦?çª?æ??é??ã??"
 
-#: ../shell/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"æ¡è¿?ä½¿ç?¨ Evolution ç??å?¯å?¥å?©ç??ã??\n"
-"é??å??ç²¾é??å°?æ??é ?å°?æ?¨å¦?ä½?å°?å¤?é?¨ç??æª?æ¡?\n"
-"å?¯å?¥å?° Evolutionã??"
+#: ../shell/e-shell-window.c:752
+msgid "UI Manager"
+msgstr "UI ç®¡ç??ç¨?å¼?"
+
+#: ../shell/e-shell-window.c:753
+#, fuzzy
+msgid "The shell window's GtkUIManager"
+msgstr "é??å§?æ??è¦?çª?ç??ä½?ç½®"
+
+#: ../shell/e-shell.c:213
+msgid "Preparing to go offline..."
+msgstr "æº?å??é?²å?¥é?¢ç·?..."
+
+#: ../shell/e-shell.c:267
+msgid "Preparing to go online..."
+msgstr "æº?å??é?²å?¥ä¸?ç·?..."
+
+#: ../shell/e-shell.c:339
+msgid "Preparing to quit..."
+msgstr "æº?å??çµ?æ??..."
+
+#: ../shell/e-shell.c:788
+msgid "Module Directory"
+msgstr "æ¨¡çµ?ç?®é??"
+
+#: ../shell/e-shell.c:789
+msgid "The directory from which to load EModules"
+msgstr "ç?¨ä¾?è¼?å?¥ EModules ç??ç?®é??"
+
+#: ../shell/e-shell.c:804
+msgid "Network Available"
+msgstr "ç¶²è·¯å?¯ä½¿ç?¨"
+
+#: ../shell/e-shell.c:805
+msgid "Whether the network is available"
+msgstr "ç¶²è·¯æ?¯å?¦å?¯ä»¥ä½¿ç?¨"
+
+#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
+msgid "Online"
+msgstr "ä¸?ç·?"
+
+#: ../shell/e-shell.c:821
+#, fuzzy
+msgid "Whether the shell is online"
+msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:226
+#: ../shell/main.c:166
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19084,7 +19773,7 @@ msgstr ""
 "æ??å??å¸?æ??æ?¨äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??æ?¨æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:190
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19092,44 +19781,56 @@ msgstr ""
 "è¬?è¬?\n"
 "Evolution å°?çµ?æ?¬ä¸?\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:197
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:317
 msgid "Start Evolution activating the specified component"
 msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??ä»¶"
 
+#: ../shell/main.c:319
+msgid "Apply the given geometry to the main window"
+msgstr "å°?æ??å®?ç??å°ºå¯¸å¥?ç?¨å?°ä¸»è¦?çª?"
+
 # zh_HK: msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
-#: ../shell/main.c:491
+#: ../shell/main.c:323
 msgid "Start in online mode"
 msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
 
-#: ../shell/main.c:494
-msgid "Forcibly shut down all Evolution components"
-msgstr "å¼·å?¶é??é??æ??æ?? Evoultion å??ä»¶"
+#: ../shell/main.c:326
+msgid "Forcibly shut down Evolution"
+msgstr "å¼·å?¶é??é?? Evoultion"
 
-#: ../shell/main.c:498
+#: ../shell/main.c:330
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "å¼·å?¶å¾? Evolution 1.4 é??æ?°ç§»è½?"
 
-#: ../shell/main.c:501
+#: ../shell/main.c:333
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??ä»¶ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:503
+#: ../shell/main.c:335
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:505
+#: ../shell/main.c:337
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??é?£çµ¡äººå??å·¥ä½?ç??é ?è¦½çª?æ ¼ã??"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:341
+msgid "Import URIs or file names given as rest of arguments."
+msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??ç¨±å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
+
+#: ../shell/main.c:343
+msgid "Request a running Evolution process to quit"
+msgstr "è¦?æ±?å?·è¡?ä¸ç?? Evolution ç¨?åº?çµ?æ??"
+
+#: ../shell/main.c:497
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:642
+#: ../shell/main.c:523
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19143,118 +19844,182 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "æ?¨ç¢ºå®?è¦?é?ºå¿?æ??æ??è¨?æ?¶ç??å¯?ç¢¼ï¼?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "ç?¡æ³?å??å?? Evolution"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "ç¹¼çº?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "å¾? {0} ç??å?ªé?¤è??è³?æ??ï¼?"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "Evolution ç?¡æ³?å??å??ã??"
+#: ../shell/shell.error.xml.h:4
+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 "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
-msgstr "é?ºå¿?æ?¨ç??å¯?ç¢¼æ??å?ªé?¤æ??æ??å·²è¨?æ?¶ç??å¯?ç¢¼ã??å?¨ä¸?æ¬¡é??è¦?ä½¿ç?¨å¯?ç¢¼æ??å°?æ??æ??ç¤ºæ?¨è¼¸å?¥ã??"
-
-#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "ç£?ç¢?ç©ºé??ä¸?è¶³ï¼?ç?¡æ³?å??ç´?ã??"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤è??è³?æ??ï¼?"
 
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
+"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"
+"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"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
 msgstr ""
 "ã??evolutionã??ç?®é??ç??æ??æ??å?§å®¹å?³å°?æ°¸ä¹?ç§»é?¤ã??\n"
 "\n"
-"å»ºè°æ?¨æ??å??æª¢æ?¥æ??æ??ç??é?»å?é?µä»¶ã??é?£çµ¡äººå??è¡?äº?æ??è³?æ??æ?¯å?¦é¡¯ç¤ºï¼?è??ä¸?æ¤ Evolution ç??æ?¬å?¨å?ªé?¤è??è³?æ??å??è?½æ£ç¢ºä½?æ¥ã??\n"
+"å»ºè°æ?¨æ??å??æª¢æ?¥æ??æ??ç??é?»å?é?µä»¶ã??é?£çµ¡äººå??è¡?äº?æ??è³?æ??æ?¯å?¦é¡¯ç¤ºï¼?è??ä¸?æ¤ Evolution ç??"
+"æ?¬å?¨å?ªé?¤è??è³?æ??å??è?½æ£ç¢ºä½?æ¥ã??\n"
 "\n"
 "å?ªé?¤ä¹?å¾?ï¼?æ?ªç¶?æ??å??æ??ä½?ï¼?ä¾¿ç?¡æ³?é??ç´?è?³è??ç?? Evolution ç??æ?¬ã??\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../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"
+"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 ""
 "è??ç?? Evolution ç??æ?¬å°?å?¶è³?æ??å?²å?å?¨ä¸?å??ç??ä½?ç½®ã??\n"
 "\n"
-"å¦?æ??é?¸æ??ç§»é?¤æ¤è³?æ??ï¼?å°?æ??æ°¸ä¹?ç§»é?¤ &quot;evolution&quot; ç?®é??ç??æ??æ??å?§å®¹ã??å¦?æ??é?¸æ??ä¿?ç??æ¤è³?æ??ï¼?å°±å?¯ä»¥å?¨æ?¹ä¾¿ç??æ??å??ï¼?æ??å??ç§»é?¤ &quot;evolution&quot; ç??å?§å®¹ã??\n"
+"å¦?æ??é?¸æ??ç§»é?¤æ¤è³?æ??ï¼?å°?æ??æ°¸ä¹?ç§»é?¤ &quot;evolution&quot; ç?®é??ç??æ??æ??å?§å®¹ã??å¦?æ??é?¸"
+"æ??ä¿?ç??æ¤è³?æ??ï¼?å°±å?¯ä»¥å?¨æ?¹ä¾¿ç??æ??å??ï¼?æ??å??ç§»é?¤ &quot;evolution&quot; ç??å?§å®¹ã??\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
-msgstr "å¾?ä»¥å??ç??ç??æ?¬å??ç´?å¤±æ??ï¼?{0}"
+#: ../shell/shell.error.xml.h:18
+msgid "Upgrade from previous version failed:"
+msgstr "å¾?ä»¥å??ç??ç??æ?¬å??ç´?å¤±æ??ï¼?"
 
-#: ../shell/shell.error.xml.h:21
+#: ../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"
+"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."
+"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:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"æ?¨ç??ç³»çµ±çµ?æ??è?? Evolution çµ?æ??ä¸?ç?¸ç¬¦ã??\n"
-"\n"
-"å¦?é??è©³ç´°è³?è¨?ï¼?è«?æ??ä¸?ä¸?æ±?å?©ã??"
-
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"æ?¨ç??ç³»çµ±çµ?æ??è?? Evolution çµ?æ??ä¸?ç?¸ç¬¦ï¼?\n"
-"\n"
-"{0}\n"
-"\n"
-"å¦?é??è©³ç´°è³?è¨?ï¼?è«?æ??ä¸?ä¸?æ±?å?©ã??"
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "é?ºå¿?(_F)"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "ä¿?ç??è³?æ??(_K)"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
 msgstr "ç¨?å¾?æ??é??æ??(_R)"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
-"{1}\n"
+"{0}\n"
 "\n"
-"å¦?æ??æ?¨é?¸æ??ç¹¼çº?ï¼?å?¯è?½ç?¡æ³?å?å??é?¨ä»½è??è³?æ??ã??\n"
+"å¦?æ??æ?¨é?¸æ??ç¹¼çº?ï¼?å?¯è?½ç?¡æ³?å?å??é?¨å??è??è³?æ??ã??\n"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../shell/test/e-test-shell-backend.c:60
+msgctxt "New"
+msgid "_Test Item"
+msgstr "æ¸¬è©¦é ?ç?®(_T)"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "å»ºç«?æ?°ç??æ¸¬è©¦é ?ç?®"
+
+#: ../shell/test/e-test-shell-backend.c:70
+msgctxt "New"
+msgid "Test _Source"
+msgstr "æ¸¬è©¦ä¾?æº?(_S)"
+
+#: ../shell/test/e-test-shell-backend.c:72
+msgid "Create a new test source"
+msgstr "å»ºç«?æ?°ç??æ¸¬è©¦ä¾?æº?"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "æª?æ¡?ä¸?æ?¯æ??æ??ç?? .desktop æª?æ¡?"
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "ç?¡æ³?è¾¨è?ç??æ¡?é?¢æª?æ¡?ç??æ?¬ã??%sã??"
+
+#: ../smclient/eggdesktopfile.c:958
+#, c-format
+msgid "Starting %s"
+msgstr "æº?å??å??å?? %s"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "æ??ç?¨ç¨?å¼?ä¸?æ?¥å??ä»¥å?½ä»¤å??é??å??æ??ä»¶"
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "ç?¡æ³?è¾¨è?ç??å??å??é?¸é ?ï¼?%d"
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "ä¸?è?½å?³é??æ??ä»¶ URI è?³ã??Type=Linkã??æ¡?é?¢é ?ç?®"
+
+#: ../smclient/eggdesktopfile.c:1394
+#, c-format
+msgid "Not a launchable item"
+msgstr "ä¸?æ?¯å?¯ä»¥å??å??ç??é ?ç?®"
+
+#: ../smclient/eggsmclient.c:227
+msgid "Disable connection to session manager"
+msgstr "å??ç?¨å?°ä½?æ¥é??æ®µç®¡ç??ç¨?å¼?ç??é?£ç·?"
+
+#: ../smclient/eggsmclient.c:230
+msgid "Specify file containing saved configuration"
+msgstr "æ??å®?å??å?«å·²å?²å?çµ?æ??ç??æª?æ¡?"
+
+#: ../smclient/eggsmclient.c:230
+msgid "FILE"
+msgstr "æª?æ¡?"
+
+#: ../smclient/eggsmclient.c:233
+msgid "Specify session management ID"
+msgstr "æ??å®?ä½?æ¥é??æ®µç®¡ç?? ID"
+
+#: ../smclient/eggsmclient.c:233
+msgid "ID"
+msgstr "ID"
+
+#: ../smclient/eggsmclient.c:254
+msgid "Session management options:"
+msgstr "ä½?æ¥é??æ®µç®¡ç??é?¸é ?ï¼?"
+
+#: ../smclient/eggsmclient.c:255
+msgid "Show session management options"
+msgstr "é¡¯ç¤ºä½?æ¥é??æ®µç®¡ç??é?¸é ?"
+
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19265,64 +20030,77 @@ msgstr ""
 "\n"
 "ç·¨è¼¯ä¿¡ä»»è¨å®?å?¼ï¼?"
 
-#: ../smime/gui/cert-trust-dialog.c:150
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "å? ç?ºæ?¨ä¿¡ä»»ç?¼å?ºæ¤æ??è?ç??æ??è?å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??æ?¨å°?ä¿¡ä»»æ¤æ??è?ç??æ??æ??æ?§ã??"
+#: ../smime/gui/cert-trust-dialog.c:144
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"å? ç?ºæ?¨ä¿¡ä»»ç?¼å?ºæ¤æ??è?ç??æ??è?å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??æ?¨å°?ä¿¡ä»»æ¤æ??è?ç??æ??æ??"
+"æ?§ã??"
 
-#: ../smime/gui/cert-trust-dialog.c:154
-msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "å? ç?ºæ?¨ä¸?ä¿¡ä»»ç?¼å?ºæ¤æ??è?ç??æ??è?å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??æ?¨å°?ä¸?ä¿¡ä»»æ¤æ??è?ç??æ??æ??æ?§ã??"
+#: ../smime/gui/cert-trust-dialog.c:148
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"å? ç?ºæ?¨ä¸?ä¿¡ä»»ç?¼å?ºæ¤æ??è?ç??æ??è?å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??æ?¨å°?ä¸?ä¿¡ä»»æ¤æ??è?ç??æ??"
+"æ??æ?§ã??"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:611
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "é?¸å??è¦?å?¯å?¥ç??æ??è?..."
 
-#: ../smime/gui/certificate-manager.c:145
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "æ??æ??ç?? PKCS12 æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:398
-#: ../smime/gui/certificate-manager.c:625
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "æ??æ??æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:275
-#: ../smime/gui/certificate-manager.c:488
-#: ../smime/gui/certificate-manager.c:713
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "æ??è?å??ç¨±"
 
-#: ../smime/gui/certificate-manager.c:284
-#: ../smime/gui/certificate-manager.c:506
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "ç?¨é??"
 
-#: ../smime/gui/certificate-manager.c:293
-#: ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "åº?è??"
 
-#: ../smime/gui/certificate-manager.c:301
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "å?°æ??"
 
-#: ../smime/gui/certificate-manager.c:392
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "æ??æ??ç??é?»å?é?µä»¶æ??è?æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:497
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "é?»å?é?µä»¶å?°å??"
 
-#: ../smime/gui/certificate-manager.c:620
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "æ??æ??ç?? CA æ??è?æª?æ¡?"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-manager.c:1050
+msgid "Certificates"
+msgstr "æ??è?"
+
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "æ??è?æª¢è¦?å?¨:%s"
@@ -19342,7 +20120,7 @@ msgid "Enter new password"
 msgstr "è¼¸å?¥æ?°å¯?ç¢¼"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19351,7 +20129,7 @@ msgstr ""
 "ç?¼çµ¦:\n"
 "  ä¸»æ?¨ï¼?%s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19360,1705 +20138,367 @@ msgstr ""
 "ç?¼ç?§è??:\n"
 "  ä¸»æ?¨ï¼?%s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "é?¸å??æ??è?"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<ä¸?æ?¯æ??è?ç??é?¨ä»½>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>æ??è?æ¬?ä½?</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>æ??è?é??å±¤</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>æ¬?ä½?å?¼</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>æ?¸ä½?æ??ç´?</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>ç?¼è¡?è??:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>ç?¼çµ¦</b>"
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>æ¤æ??è?å·²ç¶?æª¢é©?ç?¨é??:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>æ??å??</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "æ¬?å¨?"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "å??ä»½"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "å?¨é?¨å??ä»½"
 
-#: ../smime/gui/smime-ui.glade.h:13
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
-msgstr "ä¿¡ä»»æ¤æ??è?ç®¡ç??ä¸å¿?ä¹?å??ï¼?å¦?æ??å?¯ä»¥ç??è©±ï¼?æ?¨æ??è©²å??æª¢æ?¥å®?ç??æ??è?ä»¥å??å®?ç??æ?¿ç?å??ç¨?åº?ã??"
+#: ../smime/gui/smime-ui.ui.h:5
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"ä¿¡ä»»æ¤æ??è?ç®¡ç??ä¸å¿?ä¹?å??ï¼?å¦?æ??å?¯ä»¥ç??è©±ï¼?æ?¨æ??è©²å??æª¢æ?¥å®?ç??æ??è?ä»¥å??å®?ç??æ?¿ç?å??ç¨?"
+"åº?ã??"
 
-#: ../smime/gui/smime-ui.glade.h:14
-#: ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "æ??è?"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "æ??è?ç®¡ç??ä¸å¿?ä¿¡ä»»åº¦"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Fields"
+msgstr "æ??è?æ¬?ä½?"
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate Hierarchy"
+msgstr "æ??è?é??å±¤"
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "æ??è?è©³ç´°è³?è¨?"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "æ??è?è¡¨æ ¼"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "ä¸?è?¬å??ç¨± (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "é?£çµ¡äººæ??è?"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Do not trust the authenticity of this certificate"
 msgstr "ä¸?ä¿¡ä»»æ¤æ??è?ç??æ??æ??æ?§"
 
-#: ../smime/gui/smime-ui.glade.h:22
-msgid "Dummy window only"
-msgstr "é??è??æ?¬è¦?çª?"
-
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Edit"
 msgstr "ç·¨è¼¯"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "é?»å?é?µä»¶æ??è?ä¿¡ä»»è¨å®?å?¼"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "é?»å?é?µä»¶æ?¶ä»¶è??æ??è?"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "é?»å?é?µä»¶ç°½ç½²è??æ??è?"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "å?°æ??æ?¥æ??"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "Field Value"
+msgstr "æ¬?ä½?æ?¸å?¼"
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Fingerprints"
+msgstr "æ?¸ä½?æ??ç´?"
+
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "å?¯å?¥"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Issued By"
+msgstr "ç?¼ç?§è??"
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "ç?¼ç?§æ?¥æ??"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Issued To"
+msgstr "ç?¼çµ¦"
+
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "MD5 æ??ç´?"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "çµ?ç¹? (O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "çµ?ç¹?å?®ä½? (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 æ??ç´?"
 
-#: ../smime/gui/smime-ui.glade.h:35
-#: ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL ç?¨æ?¶ç«¯æ??è?"
 
-#: ../smime/gui/smime-ui.glade.h:36
-#: ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL ä¼ºæ??å?¨æ??è?"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:35
+msgid "This certificate has been verified for the following uses:"
+msgstr "æ¤æ??è?å·²ç¶?æª¢é©?ç?¨æ?¼ä¸?å??ç?¨é??ï¼?"
+
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "ä¿¡ä»»æ¤æ??è?ç??æ??æ??æ?§"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust this CA to identify email users."
 msgstr "ä¿¡ä»»æ¤æ??è?ç®¡ç??ä¸å¿? (CA) ä¾?è?å?¥é?»å?é?µä»¶ä½¿ç?¨è??ã??"
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "ä¿¡ä»»æ¤æ??è?ç®¡ç??ä¸å¿? (CA) ä¾?è?å?¥è»?é«?é??ç?¼äººå?¡ã??"
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "ä¿¡ä»»æ¤æ??è?ç®¡ç??ä¸å¿? (CA) ä¾?è?å?¥ç¶²ç«?ã??"
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:40
+msgid "Validity"
+msgstr "æ??æ??æ?§"
+
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "æª¢è¦?"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "æ?¨å·²ç¶?æ??ä¾?è?ªé??äº?çµ?ç¹?ç??æ??è?ï¼?å?¯ä»¥è?å?¥æ?¨ç??èº«ä»½:"
 
-#: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+#: ../smime/gui/smime-ui.ui.h:43
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "æ?¨å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??æ??è?ï¼?å?¯ä»¥è?å?¥é??äº?æ??è?ç®¡ç??ä¸å¿?:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "æ?¨å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??æ??è?ï¼?å?¯ä»¥è?å?¥é??äº?äººå?¡:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "æ?¨ç??æ??è?"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_Edit CA Trust"
 msgstr "ç·¨è¼¯æ??è?ç®¡ç??ä¸å¿? (_CA) ä¿¡ä»»åº¦"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:711
 msgid "Certificate already exists"
 msgstr "æ??è?å·²ç¶?å?å?¨"
 
-#: ../smime/lib/e-cert.c:222
-#: ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "ç°½ç½²"
 
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "å? å¯?"
 
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "ç??æ?¬"
 
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "ç??æ?¬ 1"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "ç??æ?¬ 2"
 
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "ç??æ?¬ 3"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "æ??è?é??é?°ä½¿ç?¨"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "Netscape æ??è?é¡?å??"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "æ??è?ç®¡ç??ä¸å¿?é??é?°è?å?¥ç¢¼"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "ç?©ä»¶è?å?¥ç¢¼ (%s)"
 
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "æ¼?ç®?æ³?è?å?¥ç¢¼"
 
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "æ¼?ç®?æ³?å??æ?¸"
 
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "ä¸»æ?¨å?¬é?°è³?è¨?"
 
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "ä¸»æ?¨å?¬é?°æ¼?ç®?æ³?"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "ä¸»æ?¨ç??å?¬é?°"
 
-#: ../smime/lib/e-cert.c:791
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "é?¯èª¤ï¼?ç?¡æ³?è??ç??å»¶ä¼¸"
 
-#: ../smime/lib/e-cert.c:812
-#: ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "ç?©ä»¶ç°½ç½²è??"
 
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "SSL æ??è?å?®ä½?"
 
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "é?»å?é?µä»¶å?®ä½?"
 
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "ç°½ç½²ä¸"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "ä¸?å?¯æ??çµ?"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "é??é?°å? å¯?"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "è³?æ??å¯?ç¢¼"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "é??é?°å??å??"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "æ??è?ç°½ç½²è??"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "CRL ç°½ç½²è??"
 
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "é??è¦?"
 
-#: ../smime/lib/e-cert.c:922
-#: ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "ä¸?é??è¦?"
 
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "å»¶ä¼¸"
 
-#: ../smime/lib/e-cert.c:1017
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072
-#: ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "æ??è?ç°½ç« æ¼?ç®?æ³?"
 
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "ç?¼ç?§è??"
 
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "ç?¼ç?§è??ç?¨æ?? ID"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "ä¸»æ?¨ç?¨æ?? ID"
 
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "æ??è?ç°½ç« å?¼"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "PKCS12 æª?æ¡?å¯?ç¢¼"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "è¼¸å?¥ PKCS12 æª?æ¡?ç??å¯?ç¢¼:"
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 msgstr "è¼¸å?¥ç??æ??è?"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: ../tools/killev.c:61
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "ç?¡æ³?å?·è¡? `%s'ï¼?%s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "é??é?? %s (%s)\n"
-
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "é??è¨?é??å±¬æ?§(_B)"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "æ?¹è®?é?¸å®?è³?æ??å¤¾ç??å±¬æ?§"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "è¤?è£½æ??æ??ç??é?£çµ¡äººå?°(_P)..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "é?£çµ¡äººé ?è¦½(_P)"
-
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "è¤?è£½"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "å°?é?¸å??ç??é?£çµ¡äººè¤?è£½å?°å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:8
-msgid "Copy the contacts of the selected folder into another folder"
-msgstr "è¤?è£½å·²é?¸å®?è³?æ??å¤¾ä¸ç??é?£çµ¡äººå?°å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:9
-#: ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "è¤?è£½é?¸å??ç??å?§å®¹"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "è¤?è£½è?³è³?æ??å¤¾..."
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new address book folder"
-msgstr "å»ºç«?æ?°é??è¨?é??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "å?ªä¸?"
-
-#: ../ui/evolution-addressbook.xml.h:13
-#: ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "å?ªä¸?é?¸å??ç¯?å??"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "å?ªé?¤é??è¨?é??(_E)"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "å?ªé?¤é?¸å®?ç??é?£çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "å?ªé?¤é?¸å®?ç??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "è½?å¯?é?£çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "å°?æ??æ??ç??é?£çµ¡äººç§»å?°(_V)..."
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move selected contacts to another folder"
-msgstr "å°?é?¸å??ç??é?£çµ¡äººç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:21
-msgid "Move the contacts of the selected folder into another folder"
-msgstr "å°?é?¸å®?è³?æ??å¤¾ä¸ç??é?£çµ¡äººç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "ç§»è?³è³?æ??å¤¾..."
-
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "è²¼ä¸?"
-
-#: ../ui/evolution-addressbook.xml.h:24
-#: ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
-
-# zh_HK: msgstr "é ?è¦½å°?è¦?æ??å?°ç??é?£çµ¡äºº"
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "é ?è¦½å°?è¦?æ??å?°ç??é?£çµ¡äºº"
-
-# zh_HK: msgstr "æ??å?°é?¸å®?ç??é?£çµ¡äºº"
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "æ??å?°é?¸å®?ç??é?£çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "é??æ?°å?½å??é?¸å®?ç??è³?æ??å¤¾"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "å°?é??è¨?é??å?¦å?ç?º VC_ard"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "å?²å?ç?º VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "å°?é?¸å??ç??é?£çµ¡äººå?²å?ç?º VCard"
-
-#: ../ui/evolution-addressbook.xml.h:33
-msgid "Save the contacts of the selected folder as VCard"
-msgstr "å°?é?¸å®?è³?æ??å¤¾ä¸ç??é?£çµ¡äººå?²å?ç?º VCard"
-
-#: ../ui/evolution-addressbook.xml.h:34
-#: ../widgets/text/e-text.c:2719
-msgid "Select All"
-msgstr "å?¨é?¨é?¸å??"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "å?¨é?¨é?¸å??(_A)"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "é?¸æ??å?¨é?¨é?£çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts"
-msgstr "å?³é??é?µä»¶è?³é?¸å??ç??é?£çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person"
-msgstr "å?³é??é?¸å??é?£çµ¡äººçµ¦å?¶ä»?ä½¿ç?¨è??ã??"
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "é¡¯ç¤ºé?£çµ¡äººé ?è¦½è¦?çª?"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "å??æ¢(_O)"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "å??æ¢"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "å??æ¢è¼?å?¥"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "æª¢è¦?ç?®å??ç??é?£çµ¡äºº"
-
-#: ../ui/evolution-addressbook.xml.h:45
-#: ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "å??ä½?(_A)"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "è¤?è£½é?£çµ¡äººå?°(_C)..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "è¤?è£½è³?æ??å¤¾é?£çµ¡äººå?°(_C)"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "å?ªé?¤é?£çµ¡äºº(_D)"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "è½?å¯?é?£çµ¡äºº(_F)..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "å°?é?£çµ¡äººç§»å?°(_M)..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "å°?è³?æ??å¤¾é?£çµ¡äººç§»å?°(_M)"
-
-#: ../ui/evolution-addressbook.xml.h:55
-#: ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "æ?°å¢?(_N)"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "é??æ?°å?½å??(_R)"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "å°?é?£çµ¡äººå?²å?ç?º VCar_d..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "å°?è³?æ??å¤¾é?£çµ¡äººå?²å?ç?º VCar_d"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "å¤©"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "å?ªé?¤å?¨é?¨é?±æ??(_A)"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "å?ªé?¤å?¨é?¨é?±æ??"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "å?ªé?¤é??å??ç´?æ??"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "å?ªé?¤æ¤é?±æ??"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "ç§»è?³"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "å??å¾?"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "å??å??"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "æ¸?å?®"
-
-#: ../ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "æ??"
-
-#: ../ui/evolution-calendar.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:193
-msgid "Next"
-msgstr "ä¸?ä¸?å??"
-
-# zh_HK: msgstr "é ?è¦½å°?è¦?æ??å?°ç??è¡?äº?æ??å?§å®¹"
-#: ../ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "é ?è¦½å°?è¦?æ??å?°ç??è¡?äº?æ??å?§å®¹"
-
-#: ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:70
-#: ../widgets/misc/e-calendar.c:169
-msgid "Previous"
-msgstr "ä¸?ä¸?å??"
-
-# zh_HK: msgstr "æ??å?°é??å??è¡?äº?æ??"
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "æ??å?°é??å??è¡?äº?æ??"
-
-#: ../ui/evolution-calendar.xml.h:23
-#: ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "æ¸?é?¤(_E)"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "å?ªé?¤è??ç´?æ??å??æ??è°"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "é?¸æ??æ?¥æ??(_D)"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "é?¸æ??ä»?å¤©(_T)"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "é?¸å??ç?¹å®?æ?¥æ??"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "é?¸å??ä»?æ?¥"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "é¡¯ç¤ºæ??æ¸?å?®"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "é¡¯ç¤ºä¸?å¤©"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "é¡¯ç¤ºä¸?å??æ??"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "é¡¯ç¤ºä¸?é?±"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "é¡¯ç¤ºå·¥ä½?é?±"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "æª¢è¦?ç?®å??ç??ç´?æ??"
-
-#: ../ui/evolution-calendar.xml.h:36
-#: ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "æª¢è¦?ç´?é??æª?è¨?æ?¯ç??é?¤é?¯ä¸»æ?§å?°"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "é?±"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "å·¥ä½?é?±"
-
-#: ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "é?¤é?¯ç´?é??æª?(_D)"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "é??å??ç´?æ??(_O)"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "å??æ¶?ç?®å??é?µä»¶æ??ä½?ç??è¡?å??"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "è¤?è£½å·²é?¸å®?ç??è³?æ??å¤¾å?°å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "å»ºç«?ä¸?å??æ?°è³?æ??å¤¾ä»¥å?²å?é?µä»¶"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "å»ºç«?æ??ç·¨è¼¯æ??å°?è³?æ??å¤¾ç??å®?ç¾©"
-
-#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit rules for filtering new mail"
-msgstr "ç?ºæ?°é?µä»¶å»ºç«?æ??ç·¨è¼¯é??æ¿¾è¦?å??"
-
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages of accounts/folders marked for offline"
-msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??å¸³è??/è³?æ??å¤¾ä¹?é?µä»¶"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "æ¸?ç??å??æ?¶ç?(_T)"
-
-#: ../ui/evolution-mail-global.xml.h:9
-#: ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "è³?æ??å¤¾(_O)"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Move the selected folder into another folder"
-msgstr "å°?é?¸å®?ç??è³?æ??å¤¾ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:12
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "æ°¸ä¹?ç§»é?¤å?¨æ??æ??è³?æ??å¤¾å?§ç??å?¨é?¨å·²å?ªé?¤ç??é?µä»¶"
-
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Search F_olders"
-msgstr "æ??å°?è³?æ??å¤¾(_O)"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½(_P)"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "å?¨é?µä»¶æ¸?å?®ä¸?æ?¹é¡¯ç¤ºé?µä»¶é ?è¦½"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "å?¨é?µä»¶æ¸?å?®æ??é¡¯ç¤ºé?µä»¶é ?è¦½"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "é¡¯ç¤ºé?µä»¶é ?è¦½è¦?çª?"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "è¨?é?±æ??å??æ¶?è¨?é?±å?¨é? ç«¯ä¼ºæ??å?¨ç??è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "å?³çµ±æª¢è¦?(_C)"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "è¤?è£½è³?æ??å¤¾å?°(_C)..."
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "ä¸?è¼?é?¢ç·?ä½¿ç?¨ç??é?µä»¶(_D)"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "é?µä»¶è¦?å??(_M)"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "ç§»å??è³?æ??å¤¾å?°(_M)..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "æ?°å¢?(_N)..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "é ?è¦½(_P)"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "è¨?é?±(_S)..."
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "å??ç?´æª¢è¦?(_V)"
-
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Change the name of this folder"
-msgstr "è®?æ?´é??å??è³?æ??å¤¾ç??å??ç¨±"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "è®?æ?´é??å??è³?æ??å¤¾ç??å±¬æ?§"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "æ?¶æ?ºæ??æ??ç?¸é??é?µä»¶(_T)"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "æ?¶æ?ºæ??æ??ç??ç?¸é??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?ªè²¼ç°¿"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "å°?é?µä»¶å?ªä¸?ä¸¦è²¼å?°å?ªè²¼ç°¿"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "å±?é??æ??æ??ç?¸é??é?µä»¶(_X)"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "å?ªé?¤(_X)"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "å±?é??æ??æ??ç??ç?¸é??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "é?±è??é?¸æ??ç??é?µä»¶(_E)"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "é?±è??å·²å?ªé?¤é?µä»¶(_D)"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "é?±è??å·²é?±è®?ç??é?µä»¶(_R)"
-
-#: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??ä»¥å?ªé?¤ç·?ç??å½¢å¼?é¡¯ç¤º"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "æ¨?ç¤ºæ??æ??é?µä»¶ç?ºå·²é?±è®?(_K)"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "å°?è³?æ??å¤¾ä¸å?¨é?¨ç??é?µä»¶æ¨?ç¤ºæ??å·²é?±è®?"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "è?ªå?ªè²¼ç°¿è²¼ä¸?é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "æ°¸ä¹?ç§»é?¤å?¨é??å??è³?æ??å¤¾å?§å·²å?ªé?¤ç??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "æ°¸ä¹?ç§»é?¤é??å??è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "é??æ?°è¼?å?¥è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "é?¸æ??é?µä»¶å?ç¾¤çµ?(_U)"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "é?¸æ??é?µä»¶æª?é (_T)"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "é?¸æ??å?¨é?¨ç??é?µä»¶(_A)"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr "é?¸æ??å?¨é?¨ç?®å??æ?ªé?¸å®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr "é?¸æ??æ??æ??ç?¸é??ç??é?µä»¶ç?ºé?¸å®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "é?¸æ??æ??æ??å??è¦?é?¸å®?é?µä»¶ç??ä¿¡"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "é¡¯ç¤ºé?±è??ç??é?µä»¶(_N)"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "é¡¯ç¤ºæ?«æ??é?±è??ç??é?µä»¶"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "å°?å·²é?±è®?ç??é?µä»¶æ?«æ??é?±è??"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ?«æ??é?±è??"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "ç?¸é??é?µä»¶æ¸?å?®"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?(_G)"
-
-#: ../ui/evolution-mail-list.xml.h:37
-#: ../ui/evolution-mail-message.xml.h:111
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "é?µä»¶(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "å? å?¥å¯?ä»¶è??å?°ç?®é??æ??å??(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "å¥?ç?¨é??æ¿¾å?¨(_P)"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "æ?°å¢?å¯?ä»¶è??è?³é??è¨?é??"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "æ??æ??é?µä»¶æª?é (_H)"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "å¥?ç?¨é??æ¿¾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "æª¢æ?¥å??å?¾é?µä»¶(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "æ?°å¯«æ?°é?µä»¶(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?ä»¶è??"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?ªè²¼ç°¿"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "å»ºç«?è¦?å??(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨è¦?å??"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?é??æ¿¾å?¨è¦?å??"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "å°?é?µä»¶å?ªä¸?ä¸¦è²¼å?°å?ªè²¼ç°¿"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "å°?æ??å?ç¸®å°?"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?ç?¸é??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "è½?å¯?ç?º(_O)..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "é??ä¿¡è«?å£?é??æ¿¾å?¨(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "å¯?ä»¶è??é??æ¿¾å?¨(_N)..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_R)..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "ä¸»æ?¨é??æ¿¾å?¨(_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "ç¯©é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ¨?å¹?"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "è·?é?¨(_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??ä¸"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?çµ¦æ??äºº"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??å? æª?æ¡?å½¢å¼?è½?å¯?çµ¦æ??äºº"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "å°?æ??å?æ?¾å¤§"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "æ¨?ç¤ºæ??(_K)"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å·²ç¶?é?±è®?"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??é??è¦?"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å??å?¾é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "å°?é?¸å??ç??é?µä»¶æ¨?ç¤ºæ??ä¸?æ?¯å??å?¾é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??æ?ªé?±è®?"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??ä¸?é??è¦?"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??è¦?å?ªé?¤"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "ä¸?æ?¯å??å?¾é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "é??å??è¦?çª?ä»¥ä¾¿æ?°å¯«é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "ä½¿ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "è?ªå?ªè²¼ç°¿è²¼ä¸?é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pr_evious Important Message"
-msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
-
-# zh_HK: msgstr "é ?è¦½é??è¦?æ??å?°ç??é?µä»¶"
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Preview the message to be printed"
-msgstr "é ?è¦½é??è¦?æ??å?°ç??é?µä»¶"
-
-# zh_HK: msgstr "æ??å?°é?µä»¶"
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Print this message"
-msgstr "æ??å?°é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:74
-msgid "Re_direct"
-msgstr "é??æ?°å°?å??(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:75
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??çµ¦æ??äºº"
-
-#: ../ui/evolution-mail-message.xml.h:80
-msgid "Reset the text to its original size"
-msgstr "é??è¨æ??å?ç?ºå??å§?å¤§å°?"
-
-#: ../ui/evolution-mail-message.xml.h:81
-msgid "Save the selected messages as a text file"
-msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å?æ??æ??å?æª?æ¡?"
-
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Search Folder from Mailing _List..."
-msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??å¤¾(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Search Folder from Recipien_ts..."
-msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??å¤¾(_T)..."
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Search Folder from S_ubject..."
-msgstr "ä¸»æ?¨æ??å°?è³?æ??å¤¾(_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Search Folder from Sen_der..."
-msgstr "å¯?ä»¶è??æ??å°?è³?æ??å¤¾(_D)..."
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search for text in the body of the displayed message"
-msgstr "æ??å°?é¡¯ç¤ºç??é?µä»¶æ?¬æ??ä¸ç??æ??å?"
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Select _All Text"
-msgstr "é?¸å??æ??æ??æ??å?(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Select all the text in a message"
-msgstr "é?¸æ??é?µä»¶ä¸ç??æ??æ??æ??å?"
-
-#: ../ui/evolution-mail-message.xml.h:89
-#: ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "è¨å®?æ?¨ç?®å??å?°è¡¨æ©?ç??ç??é?¢è¨å®?"
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??ä¸é¡¯ç¤ºé??ç??æ¸¸æ¨?"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Show messages with all email headers"
-msgstr "é¡¯ç¤ºé?µä»¶å??è©³ç´°æª?é "
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Show the raw email source of the message"
-msgstr "é¡¯ç¤ºé?µä»¶å??å§?æª?"
-
-#: ../ui/evolution-mail-message.xml.h:93
-msgid "Undelete the selected messages"
-msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Uni_mportant"
-msgstr "ä¸?é??è¦?(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Zoom _Out"
-msgstr "æ??é? (_O)"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "_Attached"
-msgstr "é??ä»¶(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "_Caret Mode"
-msgstr "æ¼?å?æ¨¡å¼?(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "_Clear Flag"
-msgstr "æ¸?é?¤æ¨?å¹?(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Delete Message"
-msgstr "å?ªé?¤é?µä»¶(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Find in Message..."
-msgstr "å?¨é?µä»¶å?§å°?æ?¾(_F)..."
-
-#: ../ui/evolution-mail-message.xml.h:104
-msgid "_Flag Completed"
-msgstr "æ¨?å¹?å·²å®?æ??(_F)"
-
-#: ../ui/evolution-mail-message.xml.h:106
-msgid "_Go To"
-msgstr "ç§»è?³(_G)"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Important"
-msgstr "é??è¦?(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Inline"
-msgstr "è¡?å?§(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Junk"
-msgstr "å??å?¾é?µä»¶(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Load Images"
-msgstr "è¼?å?¥å??ç??(_L)"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Message Source"
-msgstr "é?µä»¶ä¾?æº?(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Next Message"
-msgstr "ä¸?ä¸?å°?é?µä»¶(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:115
-msgid "_Normal Size"
-msgstr "æ£å¸¸å¤§å°?(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Not Junk"
-msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Open in New Window"
-msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Previous Message"
-msgstr "ä¸?ä¸?å°?é?µä»¶(_P)"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Quoted"
-msgstr "å¼?æ??(_Q)"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Read"
-msgstr "å·²é?±è®?(_R)"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Save Message..."
-msgstr "å?²å?é?µä»¶(_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Undelete Message"
-msgstr "å¾©å??å?ªé?¤é?µä»¶(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Unread"
-msgstr "æ?ªé?±è®?(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:127
-msgid "_Zoom"
-msgstr "ç¸®æ?¾(_Z)"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Zoom In"
-msgstr "æ??è¿?(_Z)"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "é??é??"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3
-#: ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "ä¸»å·¥å?·å??"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "è¤?è£½é?¸å®?ç??å??å¿?é??"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "å?ªä¸?é?¸å®?ç??å??å¿?é??"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
-
-# zh_HK: msgstr "é ?è¦½å°?è¦?æ??å?°ç??å??å¿?é??æ¸?å?®"
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "é ?è¦½å°?è¦?æ??å?°ç??å??å¿?é??æ¸?å?®"
-
-# zh_HK: msgstr "æ??å?°å??å¿?é??æ¸?å?®"
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "æ??å?°å??å¿?é??æ¸?å?®"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "æª¢è¦?é?¸å??ç??å??å¿?é??"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "é??å??å??å¿?é??(_O)"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "è¤?è£½é?¸å®?ç??å·¥ä½?"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "å?ªä¸?é?¸å®?ç??å·¥ä½?"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "å?ªé?¤å·²å®?æ??ç??å·¥ä½?"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "æ¨?ç¤ºç?ºå®?æ??(_K)"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?ç¤ºæ??å®?æ??"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-msgstr "è²¼ä¸?å?ªè²¼ç°¿ä¸?ç??å·¥ä½?"
-
-# zh_HK: msgstr "é ?è¦½å°?è¦?æ??å?°ç??å·¥ä½?æ¸?å?®"
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-msgstr "é ?è¦½å°?è¦?æ??å?°ç??å·¥ä½?æ¸?å?®"
-
-# zh_HK: msgstr "æ??å?°å·¥ä½?æ¸?å?®"
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "æ??å?°å·¥ä½?æ¸?å?®"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "é¡¯ç¤ºé?£çµ¡äººé ?è¦½è¦?çª?"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "å·¥ä½?é ?è¦½(_P)"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "æª¢è¦?é?¸å??ç??å·¥ä½?"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "é??å??å·¥ä½?(_O)"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "é??æ?¼ Evolution..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "æ?¹è®? Evolution ç??è¨å®?å?¼"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "è®?æ?´å·¥å?·å??ç??å?¯è¦?æ?§"
-
-#: ../ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
-msgstr "å»ºç«?ä¸?å??æ?°ç??è¦?çª?ä¾?é¡¯ç¤ºé??å??è³?æ??å¤¾"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr "ä½¿ç?¨æ¡?é?¢å·¥å?·å??è¨å®?å?¼é¡¯ç¤ºè¦?çª?æ??é??"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "é¡¯ç¤ºè¦?çª?æ??é??ç??å??ç¤ºå??æ??å?"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??å??ç¤º"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??æ??å?"
-
-#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "é?¢é??é??å??ç¨?å¼?"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "å?ªé?¤å·²è¨?é??ç??å¯?ç¢¼ä»¥ä¾¿å?¯å??é??æ?°è¼¸å?¥"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "é?±è??è¦?çª?æ??é??"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "å?¯å?¥(_M)..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "å??ç¤ºå??æ??å?(_A)"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "å?¯å?¥å?¶ä»?ç¨?å¼?ç??è³?æ??"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "ä½?å±?(_O)"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "é??æ?°è¦?çª?(_W)"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "é??å??å¸¸è¦?å??é¡?(FAQ)ç¶²é ?"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "é ?é?¢è¨å®?(_U)..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "å??å¥½è¨å®?(_N)"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "å?³é??/æ?¥æ?¶"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "å?³é??/æ?¥æ?¶(_R)"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "å?³é??å¾?é??ç??é ?ç?®ä¸¦æ?¥æ?¶æ?°ç??é ?ç?®"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "è¨å®? Pilot çµ?æ??"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "é¡¯ç¤ºå?´é??æ¬?(_B)"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "é¡¯ç¤ºç??æ??å??(_S)"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "é¡¯ç¤ºå·¥å?·å??(_T)"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "é¡¯ç¤º Evolution ç?¸é??è³?è¨?"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "å?³é??é?¯èª¤å ±å??"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "å?³é??é?¯èª¤å ±å??(_B)"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "ä½¿ç?¨ Bug Buddy é??å?ºé?¯èª¤å ±å??ã??"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "å??æ??é?¢ç·?/å?¨ç·?å·¥ä½?ç??ç??æ??ã??"
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "å·¥å?·å??é¢¨æ ¼(_B)"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "é¡¯ç¤º/é?±è??å?´é??å??"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "é¡¯ç¤º/é?±è??ç??æ??å??"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "é?¢ç·?å·¥ä½?(_O)"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "é??æ?¼(_A)"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "é??é??è¦?çª?(_C)"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "é?ºå¿?å¯?ç¢¼(_F)"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "å¸¸è¦?å??é¡?(_F)"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "é?±è??æ??é??(_H)"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "å?ªæ??å??ç¤º(_I)"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "å¿«é??å??å¥½è¨å®?(_Q)"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "çµ?æ??(_Q)"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "å??æ??å¤?è§?(_S)"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "å??æ¥å??é?¸é ?(_S)..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "å?ªæ??æ??å?(_T)"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "è¦?çª?(_O)"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "ä¾?å?¬å?¸(_C)"
@@ -21067,8 +20507,7 @@ msgstr "ä¾?å?¬å?¸(_C)"
 msgid "_Address Cards"
 msgstr "å?°å??å?¡(_A)"
 
-#: ../views/addressbook/galview.xml.h:3
-#: ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "æ¸?å?®æª¢è¦?(_L)"
 
@@ -21133,62 +20572,61 @@ 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:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
+#: ../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
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>æ??å??</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>é?¸æ??(_S)</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "é?¸æ??ä¸?å??æ??å??"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "æ??å??"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
 msgstr "æ??å??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "ä½¿ç?¨æ»?é¼ å·¦é?µæ??è¿?å?°å??ç??å??å??ï¼?ç?¶å¾?é?¸å??æ??å??ã??\n"
 "ä½¿ç?¨æ»?é¼ å?³é?µæ??é? ã??"
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+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:356
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../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:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:337
 msgid "Define Views"
 msgstr "å®?ç¾©æª¢è¦?"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "å®?ç¾©ã??%sã??ç??æª¢è¦?"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "è¡¨æ ¼"
 
@@ -21196,132 +20634,58 @@ msgstr "è¡¨æ ¼"
 msgid "Instance"
 msgstr "å¯¦é«?"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "å?²å?ç?®å??æª¢è¦?"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "å»ºç«?æ?°ç??æª¢è¦?(_C)"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "ç½®æ??ç?¾å?ç??æª¢è¦?(_R)"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:580
-#: ../widgets/menus/gal-view-menus.c:365
-msgid "Custom View"
-msgstr "è?ªè¨?æª¢è¦?"
-
-#: ../widgets/menus/gal-view-instance.c:581
-msgid "Save Custom View"
-msgstr "å?²å?è?ªè¨?æª¢è¦?"
-
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:388
-msgid "Define Views..."
-msgstr "å®?ç¾©æª¢è¦?..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "ç?®å??æª¢è¦?(_U)"
-
-#: ../widgets/menus/gal-view-menus.c:327
-#, c-format
-msgid "Select View: %s"
-msgstr "é?¸æ??æª¢è¦?ï¼?%s"
-
-#: ../widgets/menus/gal-view-menus.c:370
-msgid "Current view is a customized view"
-msgstr "ç?®å??ç??æª¢è¦?æ?¹å¼?æ?¯è?ªè¨?ç??æª¢è¦?"
-
-#: ../widgets/menus/gal-view-menus.c:374
-msgid "Save Custom View..."
-msgstr "å?²å?è?ªè¨?æª¢è¦?..."
-
-#: ../widgets/menus/gal-view-menus.c:379
-msgid "Save current custom view"
-msgstr "å?²å?ç?®å??ç??è?ªè¨?æª¢è¦?"
-
-#: ../widgets/menus/gal-view-menus.c:393
-msgid "Create or edit views"
-msgstr "å»ºç«?æ??ç·¨è¼¯æª¢è¦?(_C)"
-
-#: ../widgets/menus/gal-view-new-dialog.c:68
+#: ../widgets/menus/gal-view-new-dialog.c:67
 msgid "Factory"
 msgstr "å·¥å» "
 
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "å®?ç¾©æ?°ç??æª¢è¦?"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "æ?°æª¢è¦?ç??å??ç¨±:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "æª¢è¦?ç??é¡?å??"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "æª¢è¦?ç??é¡?å??:"
 
-#: ../widgets/misc/e-attachment.c:990
-msgid "Attached message"
-msgstr "é??å? ç??é?µä»¶"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1773
-#: ../widgets/misc/e-attachment.c:2313
-#: ../widgets/misc/e-attachment-store.c:636
-msgid "attachment.dat"
-msgstr "attachment.dat"
-
-#: ../widgets/misc/e-attachment.c:1822
-#: ../widgets/misc/e-attachment.c:2619
-msgid "A load operation is already in progress"
-msgstr "è¼?å?¥æ??ä½?å·²å?¨é?²è¡?ä¸"
-
-#: ../widgets/misc/e-attachment.c:1830
-#: ../widgets/misc/e-attachment.c:2627
-msgid "A save operation is already in progress"
-msgstr "å?²å?æ??ä½?å·²å?¨é?²è¡?ä¸"
-
-#: ../widgets/misc/e-attachment.c:1923
-#, c-format
-msgid "Could not load '%s'"
-msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
-
-#: ../widgets/misc/e-attachment.c:1926
-#, c-format
-msgid "Could not load the attachment"
-msgstr "ç?¡æ³?è¼?å?¥é??ä»¶"
-
-#: ../widgets/misc/e-attachment.c:2190
-#, c-format
-msgid "Could not open '%s'"
-msgstr "ç?¡æ³?é??å??ã??%sã??"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "é ?è¨å?¼(_F)"
 
-#: ../widgets/misc/e-attachment.c:2193
-#, c-format
-msgid "Could not open the attachment"
-msgstr "ç?¡æ³?é??å??é??ä»¶"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "å¸³è??å??ç¨±"
 
-#: ../widgets/misc/e-attachment.c:2635
-msgid "Attachment contents not loaded"
-msgstr "ç?¡æ³?è¼?å?¥é??ä»¶å?§å®¹"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "é??è¨?å??å®?"
 
-#: ../widgets/misc/e-attachment.c:2712
-#, c-format
-msgid "Could not save '%s'"
-msgstr "ç?¡æ³?å?²å?ã??%sã??"
+#: ../widgets/misc/e-action-combo-box.c:388
+msgid "Action"
+msgstr "å??ä½?"
 
-#: ../widgets/misc/e-attachment.c:2715
-#, c-format
-msgid "Could not save the attachment"
-msgstr "ç?¡æ³?å?²å?é??ä»¶"
+#: ../widgets/misc/e-action-combo-box.c:389
+#, fuzzy
+msgid "A GtkRadioAction"
+msgstr "GtkRadioAction"
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
@@ -21335,10 +20699,19 @@ msgstr "æª?æ¡?å??ç¨±(_F):"
 msgid "MIME Type:"
 msgstr "MIME é¡?å??ï¼?"
 
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "å»ºè°è?ªå??é¡¯ç¤ºé??ä»¶(_S)"
+
 #: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "ç?¡æ³?è¨ç?ºè??æ?¯"
 
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "è¨ç?ºè??æ?¯(_B)"
+
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
@@ -21364,28 +20737,37 @@ msgid "Saving"
 msgstr "å?²å?ä¸"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
-msgstr "é?±è??é??å? æª?æ¡?å??(_A)"
+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:626
 msgid "Show _Attachment Bar"
-msgstr "é¡¯ç¤ºé??å? æª?æ¡?å??(_A)"
+msgstr "é¡¯ç¤ºé??ä»¶å??(_A)"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "å? å?¥é??ä»¶"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "A_ttach"
 msgstr "é??å? (_T)"
 
-#: ../widgets/misc/e-attachment-store.c:607
+#: ../widgets/misc/e-attachment-store.c:604
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "å?²å?é??ä»¶"
 msgstr[1] "å?²å?é??ä»¶"
 
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2317
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
 #: ../widgets/misc/e-attachment-view.c:300
 msgid "S_ave All"
 msgstr "å?²å?å?¨é?¨(_A)"
@@ -21394,6 +20776,14 @@ msgstr "å?²å?å?¨é?¨(_A)"
 msgid "A_dd Attachment..."
 msgstr "å? å?¥é??ä»¶(_A)..."
 
+#: ../widgets/misc/e-attachment-view.c:350
+msgid "_Hide"
+msgstr "é?±è??(_H)"
+
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "æª¢è¦?è¡?å?§(_V)"
+
 #: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open with \"%s\""
@@ -21404,8 +20794,63 @@ msgstr "ä»¥ã??%sã??é??å??"
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s ä¸é??å??é??å??é??ä»¶"
 
+#. To Translators: This text is set as a description of an attached message,
+#. when, for example, attaching it to a composer. When the message to be
+#. attached has also filled Subject, then this text is of form
+#. "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:1002
+msgid "Attached message"
+msgstr "é??å? ç??é?µä»¶"
+
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "è¼?å?¥æ??ä½?å·²å?¨é?²è¡?ä¸"
+
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "å?²å?æ??ä½?å·²å?¨é?²è¡?ä¸"
+
+#: ../widgets/misc/e-attachment.c:1920
+#, c-format
+msgid "Could not load '%s'"
+msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load the attachment"
+msgstr "ç?¡æ³?è¼?å?¥é??ä»¶"
+
+#: ../widgets/misc/e-attachment.c:2197
+#, c-format
+msgid "Could not open '%s'"
+msgstr "ç?¡æ³?é??å??ã??%sã??"
+
+#: ../widgets/misc/e-attachment.c:2200
+#, c-format
+msgid "Could not open the attachment"
+msgstr "ç?¡æ³?é??å??é??ä»¶"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "ç?¡æ³?è¼?å?¥é??ä»¶å?§å®¹"
+
+#: ../widgets/misc/e-attachment.c:2711
+#, c-format
+msgid "Could not save '%s'"
+msgstr "ç?¡æ³?å?²å?ã??%sã??"
+
+#: ../widgets/misc/e-attachment.c:2714
+#, c-format
+msgid "Could not save the attachment"
+msgstr "ç?¡æ³?å?²å?é??ä»¶"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../widgets/misc/e-buffer-tagger.c:359
+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:1253
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%Y å¹´ %-m æ??"
 
@@ -21413,361 +20858,333 @@ msgstr "%Y å¹´ %-m æ??"
 msgid "Month Calendar"
 msgstr "æ??è¡?äº?æ??"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455
-#: ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3387
+#: ../widgets/text/e-text.c:3388
 msgid "Fill color"
 msgstr "å¡«å?¥è?²å½©"
 
-#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:462
-#: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469
-#: ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640
-#: ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482 ../widgets/text/e-text.c:3394
+#: ../widgets/text/e-text.c:3395 ../widgets/text/e-text.c:3401
+#: ../widgets/text/e-text.c:3402
 msgid "GDK fill color"
 msgstr "GDK å¡«è?²"
 
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476
-#: ../widgets/text/e-text.c:3653
-#: ../widgets/text/e-text.c:3654
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489 ../widgets/text/e-text.c:3408
+#: ../widgets/text/e-text.c:3409
 msgid "Fill stipple"
 msgstr "å¡«å?¥ç¶²é»?"
 
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
+#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:510
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
+#: ../widgets/misc/e-canvas-background.c:516
+#: ../widgets/misc/e-canvas-background.c:517
 msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/misc/e-reflow.c:1414
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-container.c:1009
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
+#: ../widgets/table/e-table-item.c:2872
 msgid "Minimum width"
 msgstr "æ??å°?å¯¬åº¦"
 
 #: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/misc/e-reflow.c:1415
-#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1010
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:2873
 msgid "Minimum Width"
 msgstr "æ??å°?å¯¬åº¦"
 
-#: ../widgets/misc/e-canvas-vbox.c:101
-#: ../widgets/misc/e-canvas-vbox.c:102
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "é??è·?"
 
-#: ../widgets/misc/e-cell-date-edit.c:296
-msgid "Now"
-msgstr "ç?¾å?¨"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "æ??é??å¿?é ?ç?ºæ¤æ ¼å¼?ï¼?%s"
-
-#: ../widgets/misc/e-cell-percent.c:76
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "æ?¸å?¼å¿?é ?æ?¯ç?± 0 å?° 100 ç??æ?¸å?"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "é?¿æ??ä¼¯æ??"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "æ³¢ç¾?ç??æµ·èª?ç³»"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "ä¸æ?èª?ç³»"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "ä¸æ??"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "æ?¯æ??å¤«èª?ç³»"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "å¸?è??æ??"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "å¸?ä¼¯ä¾?æ??"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "æ?¥æ??"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "é??æ??"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "æ³°æ??"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "å??è?³å?¶æ??"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "è?¬å??ç¢¼"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "è¥¿æ?èª?ç³»"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "è¥¿æ?èª?ç³»ï¼?æ?°"
-
-#: ../widgets/misc/e-charset-picker.c:89
-#: ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "æ£é«?"
-
-#: ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "ç°¡é«?"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "ç??å??è?èª?"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "è¦?è¦º"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "ä¸?æ??ç??å?å??é??ï¼?%s"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "å?å??ç·¨ç¢¼"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "è¼¸å?¥è¦?ä½¿ç?¨ç??å?å??é??"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "å?¶å®?..."
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "å?å??ç·¨ç¢¼(_A)"
-
-#: ../widgets/misc/e-dateedit.c:295
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "æ?¥æ??è??æ??å?»"
 
-#: ../widgets/misc/e-dateedit.c:315
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Text entry to input date"
 msgstr "ç?¨ä¾?è¼¸å?¥æ?¥æ??ç??æ??å?é ?ç?®"
 
-#: ../widgets/misc/e-dateedit.c:337
+#: ../widgets/misc/e-dateedit.c:566
 msgid "Click this button to show a calendar"
 msgstr "æ??æ¤æ??é??ä»¥é¡¯ç¤ºè¡?äº?æ??"
 
-#: ../widgets/misc/e-dateedit.c:379
+#: ../widgets/misc/e-dateedit.c:612
 msgid "Drop-down combination box to select time"
 msgstr "ç?¨ä»¥é?¸æ??æ??å?»ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/misc/e-dateedit.c:455
+#: ../widgets/misc/e-dateedit.c:684
 msgid "No_w"
 msgstr "ç?¾å?¨(_W)"
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:690
 msgid "_Today"
 msgstr "ä»?å¤©(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1583
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:698
+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:1935
+msgctxt "date"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../widgets/misc/e-dateedit.c:1830
 msgid "Invalid Date Value"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1613
+#: ../widgets/misc/e-dateedit.c:1874
 msgid "Invalid Time Value"
 msgstr "ç?¡æ??ç??æ??å?»æ?¸å?¼"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:123
-#: ../widgets/misc/e-filter-bar.c:178
-#: ../widgets/misc/e-filter-bar.c:306
-#: ../widgets/misc/e-filter-bar.c:737
-msgid "Advanced Search"
-msgstr "é?²é??æ??å°?"
+#: ../widgets/misc/e-import-assistant.c:238
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr "é?¸å??è¦?å?¯å?¥ Evolution ç??æª?æ¡?ï¼?ä¸¦ä¸?å?¨æ¸?å?®å?§é?¸å??æª?æ¡?é¡?å??ã??"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:229
-msgid "Save Search"
-msgstr "å?²å?æ??å°?çµ?æ??"
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "æª?æ¡?å??ç¨±(_I):"
 
-#: ../widgets/misc/e-filter-bar.c:266
-msgid "_Searches"
-msgstr "æ??å°?(_S)"
+#: ../widgets/misc/e-import-assistant.c:265
+msgid "Select a file"
+msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../widgets/misc/e-filter-bar.c:268
-msgid "Searches"
-msgstr "æ??å°?"
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
+msgid "File _type:"
+msgstr "æª?æ¡?é¡?å??(_T):"
 
-#: ../widgets/misc/e-filter-bar.h:100
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "_Save Search..."
-msgstr "å?²å?æ??å°?çµ?æ??(_S)..."
+#: ../widgets/misc/e-import-assistant.c:322
+msgid "Choose the destination for this import"
+msgstr "é?¸æ??æ¤è¼¸å?¥ç??ç?®ç??å?°"
 
-#: ../widgets/misc/e-filter-bar.h:101
-#: ../widgets/misc/e-filter-bar.h:111
-msgid "_Edit Saved Searches..."
-msgstr "ç·¨è¼¯å?²å?ç??æ??å°?çµ?æ??(_E)..."
+#: ../widgets/misc/e-import-assistant.c:347
+msgid "Choose the type of importer to run:"
+msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
 
-#: ../widgets/misc/e-filter-bar.h:102
-#: ../widgets/misc/e-filter-bar.h:112
-msgid "_Advanced Search..."
-msgstr "é?²é??æ??å°?(_A)..."
+#: ../widgets/misc/e-import-assistant.c:355
+msgid "Import data and settings from _older programs"
+msgstr "å¾?è??ç¨?å¼?è¼¸å?¥è³?æ??å??è¨å®?å?¼(_O)"
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "æ??æ??ç??å¸³è??"
+#: ../widgets/misc/e-import-assistant.c:363
+msgid "Import a _single file"
+msgstr "å?¯å?¥å?®ä¸?æª?æ¡?(_S)"
 
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "ç?®å??ç??å¸³è??"
+#: ../widgets/misc/e-import-assistant.c:439
+msgid "Select what type of file you want to import from the list."
+msgstr "é?¸æ??æ?¨æ?³è¦?å¾?æ¸?å?®ä¸å?¯å?¥ç??æª?æ¡?é¡?å??ã??"
 
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "ç?®å??ç??è³?æ??å¤¾"
+#: ../widgets/misc/e-import-assistant.c:516
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution å·²ç¶?æª¢æ?¥å¾?ä»¥ä¸?æ??ç?¨ç¨?å¼?è¼¸å?¥ç??è¨å®?å?¼ï¼?Pineã??Netscapeã??Elmã??"
+"iCalendarã??æ?¾ä¸?å?°å?¯ä»¥è¼¸å?¥ç??è¨å®?å?¼ã??å¦?æ??æ?¨æ?³å??è©¦ä¸?æ¬¡ï¼?è«?æ??ä¸?ä¸?ã??å??å¾?ã??æ??é??ã??"
+
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
+msgid "Evolution Import Assistant"
+msgstr "Evolution å?¯å?¥å?©ç??"
+
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "è¼¸å?¥ä½?ç½®"
+
+#: ../widgets/misc/e-import-assistant.c:1207
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"æ¡è¿?ä½¿ç?¨ Evolution ç??å?¯å?¥å?©ç??ã??\n"
+"é??å??ç²¾é??å°?æ??é ?å°?æ?¨å¦?ä½?å°?å¤?é?¨ç??æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-image-chooser.c:168
-msgid "Choose Image"
-msgstr "é?¸æ??å??ç??"
+#: ../widgets/misc/e-import-assistant.c:1223
+msgid "Importer Type"
+msgstr "è¼¸å?¥å?¨é¡?å??"
 
-#: ../widgets/misc/e-map.c:605
+#: ../widgets/misc/e-import-assistant.c:1232
+msgid "Select Information to Import"
+msgstr "é?¸æ??è¦?å?¯å?¥ç??è³?è¨?"
+
+#: ../widgets/misc/e-import-assistant.c:1240
+msgid "Select a File"
+msgstr "é?¸å??æª?æ¡?"
+
+#: ../widgets/misc/e-import-assistant.c:1255
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "æ??ã??å¥?ç?¨ã??é??å§?å°?æª?æ¡?å?¯å?¥å?° Evolutionã??"
+
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
+msgid "Import Data"
+msgstr "å?¯å?¥è³?æ??"
+
+#: ../widgets/misc/e-map.c:621
 msgid "World Map"
 msgstr "ä¸?ç??å?°å??"
 
-#: ../widgets/misc/e-map.c:607
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
-msgstr "ç?¨ä¾?é?¸æ??æ??å??ç??æ»?é¼ äº?å??å¼?å?°å??å??ä»¶ã??ä½¿ç?¨é?µç?¤ç??ä½¿ç?¨è??æ??è©²ä½¿ç?¨ä¸?æ?¹ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?ä¾?é?¸æ??æ??å??ã??"
+#: ../widgets/misc/e-map.c:623
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"ç?¨ä¾?é?¸æ??æ??å??ç??æ»?é¼ äº?å??å¼?å?°å??å??ä»¶ã??ä½¿ç?¨é?µç?¤ç??ä½¿ç?¨è??æ??è©²ä½¿ç?¨ä¸?æ?¹ç??ä¸?æ??å¼?çµ?å??æ?¹"
+"å¡?ä¾?é?¸æ??æ??å??ã??"
+
+# zh_HK: msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
+#: ../widgets/misc/e-online-button.c:27
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "ä¸?ç·?"
+# zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+#: ../widgets/misc/e-online-button.c:30
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+
+# zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+#: ../widgets/misc/e-online-button.c:33
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "å? ç?ºç¶²è·¯ç?¡æ³?ä½¿ç?¨ï¼?Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??"
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
 
-#: ../widgets/misc/e-pilot-settings.c:99
+#: ../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:107
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "å??æ¥ç§?äººè¨?é??:"
 
-#: ../widgets/misc/e-pilot-settings.c:116
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "å??æ¥å??é¡?:"
 
-#: ../widgets/misc/e-reflow.c:1435
-#: ../widgets/misc/e-reflow.c:1436
-msgid "Empty message"
-msgstr "ç©ºç?½é?µä»¶"
-
-#: ../widgets/misc/e-reflow.c:1442
-#: ../widgets/misc/e-reflow.c:1443
-msgid "Reflow model"
-msgstr "å??æµ?æ¨¡å¼?"
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "Evolution å??å¥½è¨å®?"
 
-#: ../widgets/misc/e-reflow.c:1449
-#: ../widgets/misc/e-reflow.c:1450
-msgid "Column width"
-msgstr "æ¬?å¯¬"
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "ç¬¦å??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:92
-#: ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503
-#: ../widgets/misc/e-search-bar.c:505
-#: ../widgets/misc/e-search-bar.c:1021
-msgid "Search"
-msgstr "æ??å°?"
+#: ../widgets/misc/e-search-bar.c:554
+msgid "Close the find bar"
+msgstr "é??é??æ??å°?å·¥å?·å??"
 
-#: ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503
-#: ../widgets/misc/e-search-bar.c:505
-msgid "Click here to change the search type"
-msgstr "æ??é??è£¡ä»¥æ?¹è®?æ??å°?é¡?å??"
+#: ../widgets/misc/e-search-bar.c:562
+msgid "Fin_d:"
+msgstr "å°?æ?¾(_D):"
 
-#: ../widgets/misc/e-search-bar.c:637
-msgid "_Search"
-msgstr "æ??å°?(_S)"
+#: ../widgets/misc/e-search-bar.c:574
+msgid "Clear the search"
+msgstr "æ¸?é?¤æ¤æ??å°?"
 
-#: ../widgets/misc/e-search-bar.c:643
-msgid "_Find Now"
-msgstr "ç«?å?³æ??å°?(_F)"
+#: ../widgets/misc/e-search-bar.c:597
+msgid "_Previous"
+msgstr "ä¸?ä¸?å??(_P)"
 
-#: ../widgets/misc/e-search-bar.c:644
-msgid "_Clear"
-msgstr "æ¸?é?¤(_C)"
+#: ../widgets/misc/e-search-bar.c:603
+msgid "Find the previous occurrence of the phrase"
+msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
 
-#: ../widgets/misc/e-search-bar.c:899
-msgid "Item ID"
-msgstr "é ?ç?® ID"
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Next"
+msgstr "ä¸?ä¸?å??(_N)"
 
-#: ../widgets/misc/e-search-bar.c:906
-#: ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
-msgid "Text"
-msgstr "æ??å?"
+#: ../widgets/misc/e-search-bar.c:619
+msgid "Find the next occurrence of the phrase"
+msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
 
-#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
-#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1053
-msgid "Sho_w: "
-msgstr "é¡¯ç¤º(_W):"
+#: ../widgets/misc/e-search-bar.c:629
+msgid "Mat_ch case"
+msgstr "å??å??å¤§å°?å¯«(_C)"
 
-#: ../widgets/misc/e-search-bar.c:1072
-msgid "Sear_ch: "
-msgstr "æ??å°?(_C):"
+#: ../widgets/misc/e-search-bar.c:657
+msgid "Reached bottom of page, continued from top"
+msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?ç«¯ç¹¼çº?"
 
-#. To Translators: The " in " label is part of the Quick Search Bar, example:
-#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1088
-msgid " i_n "
-msgstr " i_n "
+#: ../widgets/misc/e-search-bar.c:679
+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
@@ -21779,322 +21196,415 @@ msgstr "æ¸¸æ¨?å??"
 msgid "Cursor Column"
 msgstr "æ¸¸æ¨?æ¬?"
 
-#: ../widgets/misc/e-selection-model.c:208
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Sorter"
 msgstr "å??é¡?å?¨"
 
-#: ../widgets/misc/e-selection-model.c:215
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Selection Mode"
 msgstr "é?¸æ??å??æ¨¡å¼?"
 
-#: ../widgets/misc/e-selection-model.c:223
+#: ../widgets/misc/e-selection-model.c:231
 msgid "Cursor Mode"
 msgstr "æ¸¸æ¨?æ¨¡å¼?"
 
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "å?ªé?¤æ??(_L):"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>é??é??é?¸é ?</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>å??è¦?</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>è¿?å??é??ç?¥</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>ç??æ??è¿½è¹¤</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "è?ªå??å?ªé?¤é ?ç?®(_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "å»ºç«?æ?°ç??å?³é??é ?ç?®è?³è¿½è¹¤è³?è¨?(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "å·²é??é??è??å·²é??å??(_V)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr "é??é??é?¸é ?"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+#, fuzzy
+msgid "For Your Eyes Only"
+msgstr "å?ªå??è¨±ç¹«çµ?ç??è£?ç½®"
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "ä¸?è?¬é?¸é ?(_R)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
-msgstr ""
-"ç?¡\n"
-"è®?ä¿¡å??æ¢?"
+#: ../widgets/misc/e-send-options.ui.h:10
+msgid "Mail Receipt"
+msgstr "é?µä»¶å??æ¢?"
 
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"ä¸?è?¬\n"
-"ç§?æ??\n"
-"å¯?\n"
-"æ©?å¯?\n"
-"æ¥µæ©?å¯?\n"
-"å?ªæ??æ?¨è?½ç??"
-
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../widgets/misc/e-send-options.ui.h:14
+msgid "Proprietary"
+msgstr "å°?å?©"
+
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "è¦?æ±?å??è¦?(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Return Notification"
+msgstr "è¿?å??é??ç?¥"
+
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
 msgstr "ç??æ??è¿½è¹¤(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"æ?ªå®?ç¾©\n"
-"é«?\n"
-"æ¨?æº?\n"
-"ä½?"
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Standard"
+msgstr "æ¨?æº?"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Status Tracking"
+msgstr "ç??æ??è¿½è¹¤"
 
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.ui.h:23
+#, fuzzy
+msgid "Top Secret"
+msgstr "é«?åº¦æ©?å¯?"
+
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
 msgstr "ç?¶æ?¥å??æ??(_P):"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When co_mpleted:"
 msgstr "ç?¶å®?æ??æ??(_M):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "When decli_ned:"
 msgstr "ç?¶æ??çµ?æ??(_N):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "Wi_thin"
 msgstr "æ?¼å?§(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_After:"
 msgstr "ä¹?å¾?(_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "_All information"
 msgstr "å?¨é?¨è³?è¨?(_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_Classification:"
 msgstr "æ¸é¡?(_C):"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delay message delivery"
 msgstr "å»¶é?²é?µä»¶é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delivered"
 msgstr "å·²é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Set expiration date"
 msgstr "è¨å®?é?¾æ??æ?¥æ??(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Until:"
 msgstr "å?®ä½?(_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "ç?¶æ??ç©ºæ??(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "ç?¶é??å??æ??(_W):"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:251
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../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
+msgid "Unnamed"
+msgstr "æ?ªå?½å??ç??"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:257
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% å®?æ??)"
+#: ../widgets/misc/e-signature-editor.c:210
+msgid "_Save and Close"
+msgstr "å?²å?å¾?é??é??(_S)"
+
+#: ../widgets/misc/e-signature-editor.c:389
+msgid "Edit Signature"
+msgstr "ç·¨è¼¯ç°½å??æª?"
+
+#: ../widgets/misc/e-signature-editor.c:404
+msgid "_Signature Name:"
+msgstr "ç°½å??æª?å??ç¨±(_S):"
+
+#: ../widgets/misc/e-signature-manager.c:294
+msgid "Add Signature Script"
+msgstr "æ?°å¢?ç°½å??å?½ä»¤ç¨¿"
 
-#: ../widgets/misc/e-url-entry.c:103
+#: ../widgets/misc/e-signature-manager.c:359
+msgid "Edit Signature Script"
+msgstr "ç·¨è¼¯ç°½å??å?½ä»¤ç¨¿"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "æ?°å¢?å?½ä»¤ç¨¿(_S)"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"é??å??å?½ä»¤ç¨¿ç??è¼¸å?ºæ??ç?¨ä¾?ä½?ç?ºæ?¨ç??\n"
+"ç°½å??æª?ã??æ?¨æ??å®?ç??å??ç¨±å?ªæ??ä½?ç?º\n"
+"é¡¯ç¤ºä¹?ç?¨ã??"
+
+#: ../widgets/misc/e-signature-script-dialog.c:311
+msgid "S_cript:"
+msgstr "å?½ä»¤ç¨¿(_C):"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+msgid "Script file must be executable."
+msgstr "å?½ä»¤ç¨¿å¿?é ?ç?ºå?¯å?·è¡?æª?ã??"
+
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "æ??é??è£¡ä»¥ç§»è?³ URL"
 
+#: ../widgets/misc/e-web-view.c:348
+msgid "_Copy Link Location"
+msgstr "è¤?è£½é?£çµ?ä½?å??(_C)"
+
+#: ../widgets/misc/e-web-view.c:350
+msgid "Copy the link to the clipboard"
+msgstr "è¤?è£½é?£çµ?å?°å?ªè²¼è??"
+
+#: ../widgets/misc/e-web-view.c:358
+msgid "_Open Link in Browser"
+msgstr "å?¨ç??è¦½å?¨å?§é??å??é?£çµ?(_O)"
+
+#: ../widgets/misc/e-web-view.c:360
+msgid "Open the link in a web browser"
+msgstr "å?¨ç¶²é ?ç??è¦½å?¨ä¸é??å??æ¤é?£çµ?"
+
+#: ../widgets/misc/e-web-view.c:368
+msgid "_Copy Email Address"
+msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??(_C)"
+
+#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+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
+#, c-format
+msgid "Click to call %s"
+msgstr "æ??ä¸?ä¸?æ?è??çµ¦ %s"
+
+#: ../widgets/misc/e-web-view.c:758
+msgid "Click to hide/unhide addresses"
+msgstr "æ??é??è£¡é?±è??/è§£é?¤é?±è??ä½?å??"
+
+#: ../widgets/misc/e-web-view.c:760
+#, c-format
+msgid "Click to open %s"
+msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
+
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
+msgid "%d %B %Y"
+msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
+
+#: ../widgets/misc/ea-calendar-item.c:311
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "è¡?äº?æ??ï¼?å¾? %s å?° %s"
+
+#: ../widgets/misc/ea-calendar-item.c:347
+msgid "evolution calendar item"
+msgstr "evolution è¡?äº?æ??é ?ç?®"
+
 #: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "å½?å?ºå¼?æ¸?å?®"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
+#: ../widgets/table/e-cell-date-edit.c:296
+msgid "Now"
+msgstr "ç?¾å?¨"
+
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:313
+msgctxt "table-date"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../widgets/table/e-cell-date-edit.c:321
+msgid "OK"
+msgstr "ç¢ºå®?"
+
+#: ../widgets/table/e-cell-date-edit.c:846
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "æ??é??å¿?é ?ç?ºæ¤æ ¼å¼?ï¼?%s"
+
+#: ../widgets/table/e-cell-percent.c:76
+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:367
+#: ../widgets/table/e-cell-pixbuf.c:364
 msgid "Focused Column"
 msgstr "è??ç?¦ç??æ¬?"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
+#: ../widgets/table/e-cell-pixbuf.c:371
 msgid "Unselected Column"
 msgstr "æ?ªé?¸æ??ç??æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1788
+#: ../widgets/table/e-cell-text.c:1627
 msgid "Strikeout Column"
 msgstr "å?ªé?¤ç·?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1795
+#: ../widgets/table/e-cell-text.c:1634
 msgid "Underline Column"
 msgstr "åº?ç·?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1641
 msgid "Bold Column"
 msgstr "ç²?é«?æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1648
 msgid "Color Column"
 msgstr "è?²å½©æ¬?"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1662
 msgid "BG Color Column"
 msgstr "è??æ?¯è?²å½©æ¬?"
 
-#: ../widgets/table/e-table-config.c:152
+#: ../widgets/table/e-table-click-to-add.c:582
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "è«?æ??é??è£¡å? å?¥"
+
+#: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "ç??æ??"
 
-#: ../widgets/table/e-table-config.c:385
-#: ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(é??å¢?)"
 
-#: ../widgets/table/e-table-config.c:385
-#: ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(é??æ¸?)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "æ?ªæ??åº?"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "æ?ªçµ?æ??ç¾¤çµ?"
 
-#: ../widgets/table/e-table-config.c:642
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "é¡¯ç¤ºæ¬?ä½?"
 
-#: ../widgets/table/e-table-config.c:663
+#: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
 msgstr "å?¯ç?¨ç??æ¬?ä½?"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨ç??æ¬?ä½?(_V):"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Ascending"
 msgstr "é??å¢?"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "å?¨é?¨æ¸?é?¤"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "å?¨é?¨æ¸?é?¤(_A)"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Descending"
 msgstr "é??æ¸?"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "å°?é ?ç?®çµ?æ??ç¾¤çµ?ï¼?ä¾?"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "ä¸?ç§»(_D)"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "ä¸?ç§»(_U)"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "é¡¯ç¤ºæª¢è¦?ä¸ç??æ¬?ä½?(_F)"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "é¡¯ç¤ºæª¢è¦?ä¸ç??æ¬?ä½?(_N)"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "é¡¯ç¤ºæª¢è¦?ä¸ç??æ¬?ä½?(_V)"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "æ??åº?"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "æ??åº?é ?ç?®ä¾?"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "æ?¥è??ä¾?"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "æ¬?ä½?é¡¯ç¤º(_F)..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "ç¾¤çµ?ä¾?(_G)..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "é¡¯ç¤ºæª¢è¦?ä¸ç??æ¬?ä½?(_S)"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "ä¾?åº?é¡¯ç¤ºé??äº?æ¬?ä½?(_S):"
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "æ??åº?(_S)..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "å? å?¥ä¸?æ¬?..."
+msgid "Add a Column"
+msgstr "å? å?¥ä¸?æ¬?"
 
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "æ¬?ä½?é?¸æ??ç¨?å¼?"
-
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22102,106 +21612,93 @@ msgstr ""
 "æ?³å?¨æ?¨ç??è¡¨æ ¼ä¸å? å?¥æ¬?ä½?ï¼?å?ªè¦?å°?å®?\n"
 "æ??æ?³è?³æ?¨å¸?æ??å®?å?ºç?¾ç??ä½?ç½®å?³å?¯ã??"
 
-#: ../widgets/table/e-table-group-container.c:341
+#: ../widgets/table/e-table-group-container.c:342
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d å??é ?ç?®)"
 msgstr[1] "%s : %s (%d å??é ?ç?®)"
 
-#: ../widgets/table/e-table-group-container.c:347
+#: ../widgets/table/e-table-group-container.c:348
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d å??é ?ç?®)"
 msgstr[1] "%s (%d å??é ?ç?®)"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
+#: ../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:3020
-#: ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:2830 ../widgets/table/e-table-item.c:2831
 msgid "Alternating Row Colors"
 msgstr "å??è??å??é??äº¤æ?¿ä½¿ç?¨ç??è?²å½©"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
+#: ../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:3027
-#: ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339
-#: ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
+#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
 msgid "Horizontal Draw Grid"
 msgstr "æ°´å¹³ç¹ªå??æ ¼"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
+#: ../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:3034
-#: ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345
-#: ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
+#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
 msgid "Vertical Draw Grid"
 msgstr "å??ç?´ç¹ªå??æ ¼"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
+#: ../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:3041
-#: ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351
-#: ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
+#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
 msgid "Draw focus"
 msgstr "ç¹ªå??ç?¦é»?"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
+#: ../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:3048
-#: ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:2858 ../widgets/table/e-table-item.c:2859
 msgid "Cursor mode"
 msgstr "æ¸¸æ¨?æ¨¡å¼?"
 
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
+#: ../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:3013
-#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:2823 ../widgets/table/e-table-item.c:2824
 msgid "Selection model"
 msgstr "é?¸æ??å??æ¨¡å??"
 
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
+#: ../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:3055
-#: ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3316
-#: ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-tree.c:3337
 msgid "Length Threshold"
 msgstr "ç??é??é?·åº¦"
 
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-container.c:974
+#: ../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:3089
-#: ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3323
-#: ../widgets/table/e-tree.c:3365
-#: ../widgets/table/e-tree.c:3366
+#: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
+#: ../widgets/table/e-table.c:3328 ../widgets/table/e-tree.c:3368
+#: ../widgets/table/e-tree.c:3369
 msgid "Uniform row height"
 msgstr "æ¨?æº?å??é«?"
 
-#: ../widgets/table/e-table-group-container.c:980
-#: ../widgets/table/e-table-group-container.c:981
+#: ../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"
@@ -22255,220 +21752,231 @@ msgstr "æ ¼å¼?å??æ¬?(_S)..."
 msgid "Custo_mize Current View..."
 msgstr "è?ªè¨?ç?®å??ç??æª¢è¦?(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1539
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1555
 msgid "_Custom"
 msgstr "è?ªè¨?(_C)"
 
-#: ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2809 ../widgets/table/e-table-item.c:2810
 msgid "Table header"
 msgstr "è¡¨æ ¼æ¨?é¡?"
 
-#: ../widgets/table/e-table-item.c:3006
-#: ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:2816 ../widgets/table/e-table-item.c:2817
 msgid "Table model"
 msgstr "è¡¨æ ¼æ¨¡å??"
 
-#: ../widgets/table/e-table-item.c:3082
-#: ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:2892 ../widgets/table/e-table-item.c:2893
 msgid "Cursor row"
 msgstr "æ¸¸æ¨?å??"
 
-#: ../widgets/table/e-table-sorter.c:172
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "æ??åº?è³?è¨?"
 
-#: ../widgets/table/e-table.c:3330
-#: ../widgets/table/e-tree.c:3372
-#: ../widgets/table/e-tree.c:3373
+#: ../widgets/table/e-table.c:3335 ../widgets/table/e-tree.c:3375
+#: ../widgets/table/e-tree.c:3376
 msgid "Always search"
 msgstr "ç¸½æ?¯æ??å°?"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3342
 msgid "Use click to add"
 msgstr "è«?æ??é??è£¡å? å?¥"
 
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "æ¨¹ç??"
+#: ../widgets/table/e-table.c:3356
+msgid "Vertical Row Spacing"
+msgstr "å??ç?´æ¬?é??è·?"
 
-#: ../widgets/table/e-tree.c:3358
-#: ../widgets/table/e-tree.c:3359
+#: ../widgets/table/e-table.c:3357
+msgid "Vertical space between rows. It is added to top and to bottom of a row"
+msgstr "å??å??ä¹?é??ç??å??ç?´é??è·?ã??å®?æ??å? å?¥å?°æ¯?å??ç??é ?ç«¯å??åº?é?¨"
+
+#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
 msgid "ETree table adapter"
 msgstr "ETree è¡¨æ ¼æ©?æ?¥å?¨"
 
-#: ../widgets/table/e-tree.c:3379
+#: ../widgets/table/e-tree.c:3382
 msgid "Retro Look"
 msgstr "æ?·è??å¤?è§?"
 
-#: ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-tree.c:3383
 msgid "Draw lines and +/- expanders."
 msgstr "ç¹ªå?ºç·?æ¢?è?? +/- å±?é??ç¬¦è??ã??"
 
-#: ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-tree.c:3389
 msgid "Expander Size"
 msgstr "å±?é??å?¨å¤§å°?"
 
-#: ../widgets/table/e-tree.c:3387
+#: ../widgets/table/e-tree.c:3390
 msgid "Size of the expander arrow"
 msgstr "å±?é??å?¨ç®è??ç??å¤§å°?"
 
-#: ../widgets/text/e-text.c:2731
+#: ../widgets/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "å½?å?º"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+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
+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
+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
+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
+msgid "collapses the row in the ETree containing this cell"
+msgstr "æ??ç?? ETree ä¸å??å?«æ¤å?²å?æ ¼ç??å??"
+
+#: ../widgets/table/gal-a11y-e-cell.c:119
+msgid "Table Cell"
+msgstr "è¡¨æ ¼ç??å?²å?æ ¼"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "å?®æ??"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+msgid "sort"
+msgstr "æ??åº?"
+
+#: ../widgets/text/e-text.c:2474
+msgid "Select All"
+msgstr "å?¨é?¨é?¸å??"
+
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "è¼¸å?¥æ³?"
 
-#: ../widgets/text/e-text.c:3548
-#: ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3303 ../widgets/text/e-text.c:3304
 msgid "Event Processor"
 msgstr "äº?ä»¶è??ç??å?¨"
 
-#: ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3310 ../widgets/text/e-text.c:3311
+msgid "Text"
+msgstr "æ??å?"
+
+#: ../widgets/text/e-text.c:3317 ../widgets/text/e-text.c:3318
 msgid "Bold"
 msgstr "ç²?é«?"
 
-#: ../widgets/text/e-text.c:3569
-#: ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3324 ../widgets/text/e-text.c:3325
 msgid "Strikeout"
 msgstr "å?ªé?¤ç·?"
 
-#: ../widgets/text/e-text.c:3576
-#: ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3331 ../widgets/text/e-text.c:3332
 msgid "Anchor"
 msgstr "é?¨é»?"
 
-#: ../widgets/text/e-text.c:3583
-#: ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3338 ../widgets/text/e-text.c:3339
 msgid "Justification"
 msgstr "å·¦å?³å°?é½?"
 
-#: ../widgets/text/e-text.c:3590
-#: ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3345 ../widgets/text/e-text.c:3346
 msgid "Clip Width"
 msgstr "å?ªè¼¯å¯¬åº¦"
 
-#: ../widgets/text/e-text.c:3597
-#: ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3352 ../widgets/text/e-text.c:3353
 msgid "Clip Height"
 msgstr "å?ªè¼¯é«?åº¦"
 
-#: ../widgets/text/e-text.c:3604
-#: ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3359 ../widgets/text/e-text.c:3360
 msgid "Clip"
 msgstr "å?ªè¼¯"
 
-#: ../widgets/text/e-text.c:3611
-#: ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3366 ../widgets/text/e-text.c:3367
 msgid "Fill clip rectangle"
 msgstr "å¡«æ»¿å?ªè¼¯æ?¹å¡?"
 
-#: ../widgets/text/e-text.c:3618
-#: ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3373 ../widgets/text/e-text.c:3374
 msgid "X Offset"
 msgstr "X ä½?ç§»"
 
-#: ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3380 ../widgets/text/e-text.c:3381
 msgid "Y Offset"
 msgstr "Y ä½?ç§»"
 
-#: ../widgets/text/e-text.c:3660
-#: ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3415 ../widgets/text/e-text.c:3416
 msgid "Text width"
 msgstr "æ??å?å¯¬åº¦"
 
-#: ../widgets/text/e-text.c:3667
-#: ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3422 ../widgets/text/e-text.c:3423
 msgid "Text height"
 msgstr "æ??å?é«?åº¦"
 
-#: ../widgets/text/e-text.c:3681
-#: ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3436 ../widgets/text/e-text.c:3437
 msgid "Use ellipsis"
 msgstr "ä½¿ç?¨ç??ç?¥è??"
 
-#: ../widgets/text/e-text.c:3688
-#: ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3443 ../widgets/text/e-text.c:3444
 msgid "Ellipsis"
 msgstr "æ©¢å??"
 
-#: ../widgets/text/e-text.c:3695
-#: ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3450 ../widgets/text/e-text.c:3451
 msgid "Line wrap"
 msgstr "æ??è¡?"
 
-#: ../widgets/text/e-text.c:3702
-#: ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3457 ../widgets/text/e-text.c:3458
 msgid "Break characters"
 msgstr "ä¸æ?·å?å??"
 
-#: ../widgets/text/e-text.c:3709
-#: ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3464 ../widgets/text/e-text.c:3465
 msgid "Max lines"
 msgstr "æ??å¤§è¡?æ?¸"
 
-#: ../widgets/text/e-text.c:3730
-#: ../widgets/text/e-text.c:3731
+#: ../widgets/text/e-text.c:3485 ../widgets/text/e-text.c:3486
 msgid "Draw borders"
 msgstr "ç¹ªè£½æ¡?ç·?"
 
-#: ../widgets/text/e-text.c:3737
-#: ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Allow newlines"
 msgstr "å??è¨±æ?°è¡?"
 
-#: ../widgets/text/e-text.c:3744
-#: ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Draw background"
 msgstr "ç¹ªè£½è??æ?¯"
 
-#: ../widgets/text/e-text.c:3751
-#: ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Draw button"
 msgstr "ç¹ªè£½æ??é??"
 
-#: ../widgets/text/e-text.c:3758
-#: ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
 msgid "Cursor position"
 msgstr "æ¸¸æ¨?ä½?ç½®"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766
-#: ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3523
 msgid "IM Context"
 msgstr "IM å¿«é¡¯è¦?çª?"
 
-#: ../widgets/text/e-text.c:3774
-#: ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
 msgid "Handle Popup"
 msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
-
-#~ msgid " Ch_eck for Supported Types "
-#~ msgstr " æª¢æ?¥å?¯æ?¯æ?´ç??é¡?å??(_E) "
-#~ msgid "Ch_eck for Supported Types "
-#~ msgstr " æª¢æ?¥å?¯æ?¯æ?´ç??é¡?å??(_E) "
-#~ msgid "Could not open autosave file"
-#~ msgstr "ç?¡æ³?é??å??è?ªå??å?²å?æª?æ¡?"
-#~ msgid "Could not create object. %s"
-#~ msgstr "ç?¡æ³?å»ºç«?ç?©ä»¶ã??%s"
-#~ msgid "Convert to a Mem_o"
-#~ msgstr "è½?æ??ç?ºå??å¿?é??(_O)"
-#~ msgid "Convert to a _Task"
-#~ msgstr "è½?æ??ç?ºå·¥ä½?(_T)"
-#~ msgid "Convert the selected message to a new event"
-#~ msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??äº?ä»¶"
-#~ msgid "Convert the selected message to a new meeting"
-#~ msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??æ??è°"
-#~ msgid "Convert the selected message to a new memo"
-#~ msgstr "å°?é?¸å??ç??é?µä»¶è½?æ??ç?ºæ?°ç??å??å¿?é??"
-#~ msgid "Convert the selected message to a new task"
-#~ msgstr "å°?é?¸å®?ç??é?µä»¶è½?æ??ç?ºæ?°ç??å·¥ä½?"
-#~ msgid "Completed on %B %d, %Y, %l:%M %p"
-#~ msgstr "å®?æ??æ?¼ %Y å¹´ %-m æ?? %-d æ?¥%p %-l:%M"
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]