[evolution] Update Simplified Chinese translation.

From: Ray Wang <raywang src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution] Update Simplified Chinese translation.
Date: Tue, 1 Dec 2009 06:16:02 +0000 (UTC)
commit 551a4ed9b2145440a7b257e1637a98b213113456
Author: Ray Wang <raywang gnome org>
Date:   Tue Dec 1 14:15:40 2009 +0700

    Update Simplified Chinese translation.

 po/zh_CN.po |23266 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 11654 insertions(+), 11612 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f9302f2..65d79d7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,335 +5,20 @@
 # Partly comes from Sun_l10n group, 2003
 # Funda Wang <fundawang linux net cn>, 2003, 2004, 2005, 2006.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:510
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 2.8\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution\n"
-"POT-Creation-Date: 2009-01-19 17:15+0000\n"
-"PO-Revision-Date: 2009-01-29 02:49+0800\n"
-"Last-Translator: YangZhang <zyangmath gmail com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-01 14:12+0700\n"
+"PO-Revision-Date: 2009-11-26 21:17+0100\n"
+"Last-Translator: Tao Wei <weitao1979 gmail com>\n"
 "Language-Team: Chinese i18n <i18n-zh googlegroup com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution address book"
-msgstr "evolution å?°å??ç°¿"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
-msgid "New Contact"
-msgstr "æ?°å»ºè??ç³»äºº"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
-msgid "New Contact List"
-msgstr "æ?°å»ºè??ç³»äººå??è¡¨"
-
-#: ../a11y/addressbook/ea-minicard-view.c:162
-#, 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 å¼ å??ç??"
-
-#: ../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:265
-msgid "It has alarms."
-msgstr "æ??æ??é??ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:268
-msgid "It has recurrences."
-msgstr "æ??å??ç?°ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:271
-msgid "It is a meeting."
-msgstr "ä¸ºä¼?è®®ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "æ?¥å??äº?ä»¶ï¼?æ??è¦?ä¸º %sã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:279
-msgid "Calendar Event: It has no summary."
-msgstr "æ?¥å??äº?ä»¶ï¼?æ? æ??è¦?ã??"
-
-#: ../a11y/calendar/ea-cal-view-event.c:299
-msgid "calendar view event"
-msgstr "æ?¥å??è§?å?¾äº?ä»¶"
-
-#: ../a11y/calendar/ea-cal-view-event.c:527
-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:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
-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 ä¸ªäº?ä»¶ã??"
-
-#. 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:803
-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:806
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
-#: ../calendar/gui/e-week-view-main-item.c:335
-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:808
-#: ../calendar/gui/calendar-component.c:813
-#: ../calendar/gui/calendar-component.c:815
-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:827
-#: ../calendar/gui/calendar-component.c:834
-#: ../calendar/gui/calendar-component.c:840
-#: ../calendar/gui/calendar-component.c:842
-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:832
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
-#: ../calendar/gui/e-week-view-main-item.c:349
-msgid "%d %b"
-msgstr "%B%-dæ?¥"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
-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:147
-msgid "Jump button"
-msgstr "è·³è½¬æ??é?®"
-
-#: ../a11y/calendar/ea-jump-button.c:156
-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:628
-msgid "edit"
-msgstr "ç¼?è¾?"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
-msgid "begin editing this cell"
-msgstr "å¼?å§?ç¼?è¾?æ¤å??å??æ ¼"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
-msgid "toggle"
-msgstr "å??æ?¢"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
-msgid "toggle the cell"
-msgstr "å??æ?¢å??å??æ ¼"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
-msgid "expand"
-msgstr "å±?å¼?"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
-msgid "expands the row in the ETree containing this cell"
-msgstr "å?¨å??å?«æ¤å??å??æ ¼ç?? ETree ä¸å±?å¼?è¡?"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
-msgid "collapse"
-msgstr "æ??å? "
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
-msgid "collapses the row in the ETree containing this cell"
-msgstr "å?¨å??å?«æ¤å??å??æ ¼ç?? ETree ä¸æ??å? è¡?"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
-msgid "Table Cell"
-msgstr "è¡¨æ ¼å??å??æ ¼"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
-msgid "click to add"
-msgstr "å??å?»å?¯æ·»å? "
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
-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 "å¼¹å?ºè??å??"
-
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "å??æ?¢é??ä»¶æ ?"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "æ¿?æ´»"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -382,10 +67,11 @@ msgid "Could not remove address book."
 msgstr "æ? æ³?å? é?¤å?°å??ç°¿ã??"
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid ""
-"Currently you can access only 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."
+"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 ä¸ªäººè??ç³»äººæ??ä»¶å¤¹ã??"
@@ -408,7 +94,7 @@ msgstr "è®¤è¯?å?° IMAP æ??å?¡å?¨å¤±è´¥ã??"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1022
 msgid "Failed to delete contact"
 msgstr "å? é?¤è??ç³»äººå¤±è´¥"
 
@@ -421,7 +107,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP æ??å?¡å?¨æ? æ³?å??åº?æ??æ??ç??å¤§çº²ä¿¡æ?¯ã??"
 
 #: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:56
 msgid "Server Version"
 msgstr "æ??å?¡å?¨ç??æ?¬"
 
@@ -517,10 +203,10 @@ 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:38 ../mail/em-vfolder-rule.c:521
+#: ../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)"
 
@@ -542,7 +228,6 @@ 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
 msgid "{0}"
 msgstr "{0}"
 
@@ -551,2052 +236,377 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "é»?è®¤å??æ¥å?°å??ï¼?"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "æ? æ³?è£?å?¥å?°å??ç°¿"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../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
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "è?ªå?¨è¡¥å?¨"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "è??ç³»äºº(_O)"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "è¯?ä¹¦"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "å?¨æ¤é??ç½®è?ªå?¨è¡¥å?¨"
-
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
-msgid "Contacts"
-msgstr "è??ç³»äºº"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book"
-msgstr "Evolution å?°å??ç°¿"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address popup"
-msgstr "Evolution å?°å??ç°¿å?°å??å¼¹å?ºæ¡?"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book address viewer"
-msgstr "Evolution å?°å??ç°¿å?°å??æ?¥ç??å?¨"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book card viewer"
-msgstr "Evolution å?°å??ç°¿å??ç??æ?¥ç??å?¨"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Address Book component"
-msgstr "Evolution å?°å??ç°¿ç»?ä»¶"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/MIME Certificate Management Control"
-msgstr "Evolution S/MIME è¯?ä¹¦ç®¡ç??æ?§ä»¶"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution æ??ä»¶å¤¹é??ç½®æ?§ä»¶"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-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:143
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:244
-#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2967
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1516
-msgid "On This Computer"
-msgstr "å?¨æ¤è®¡ç®?æ?ºä¸"
-
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:151
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
-msgid "Personal"
-msgstr "ä¸ªäºº"
-
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "å?¨ LDAP æ??å?¡å?¨ä¸?"
-
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgctxt "New"
-msgid "_Contact"
-msgstr "è??ç³»äºº(_C)"
-
-#: ../addressbook/gui/component/addressbook-component.c:230
-msgid "Create a new contact"
-msgstr "å??å»ºä¸?ä¸ªæ?°è??ç³»äºº"
-
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgctxt "New"
-msgid "Contact _List"
-msgstr "è??ç³»äººå??è¡¨(_L)"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
-msgid "Create a new contact list"
-msgstr "å??å»ºä¸?ä¸ªæ?°ç??è??ç³»äººå??è¡¨"
-
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1223
-msgid "New Address Book"
-msgstr "æ?°å?°å??ç°¿"
-
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgctxt "New"
-msgid "Address _Book"
-msgstr "å?°å??ç°¿(_B)"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
-msgid "Create a new address book"
-msgstr "å??å»ºæ?°å?°å??ç°¿"
-
-#: ../addressbook/gui/component/addressbook-component.c:409
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "å??çº§å?°å??ç°¿è®¾ç½®æ??æ??ä»¶å¤¹å¤±è´¥ã??"
-
-#: ../addressbook/gui/component/addressbook-config.c:332
-msgid "Base"
-msgstr "å?ºç¡?"
-
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
-msgid "_Type:"
-msgstr "ç±»å??(_T)ï¼?"
-
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy _book content locally for offline operation"
-msgstr "å°?å?°å??ç°¿å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_B)"
-
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "å¸¸è§?"
-
-#: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "å?°å??ç°¿"
-
-#: ../addressbook/gui/component/addressbook-config.c:1003
-msgid "Server Information"
-msgstr "æ??å?¡å?¨ä¿¡æ?¯"
-
-#: ../addressbook/gui/component/addressbook-config.c:1005
-msgid "Authentication"
-msgstr "èº«ä»½éª?è¯?"
-
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "ç»?è??"
-
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:985
-msgid "Searching"
-msgstr "æ??ç´¢"
-
-#: ../addressbook/gui/component/addressbook-config.c:1011
-msgid "Downloading"
-msgstr "ä¸?è½½"
-
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
-msgid "Address Book Properties"
-msgstr "å?°å??ç°¿å±?æ?§"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
-msgid "Migrating..."
-msgstr "æ£å?¨å??è¿?..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
-#, c-format
-msgid "Migrating '%s':"
-msgstr "å??è¿?â??%sâ??ï¼?"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:646
-msgid "LDAP Servers"
-msgstr "LDAP æ??å?¡å?¨"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:761
-msgid "Autocompletion Settings"
-msgstr "è?ªå?¨è¡¥å?¨è®¾ç½®"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
-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:1151
-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:1160
-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:1170
-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 å??æ¥æ?´æ?°æ?¥å¿?å??å?°å?¾æ??ä»¶å·²ç»?æ?´æ?¹ã??\n"
-"\n"
-"è¯·ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç?? Pilot å??æ¥æ?°æ?®..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "å°?â??%sâ??æ??ä»¶å¤¹é??å?½å??ä¸ºï¼?"
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
-msgid "Rename Folder"
-msgstr "é??å?½å??æ??ä»¶å¤¹"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
-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:660
-#: ../calendar/gui/memos-component.c:501 ../calendar/gui/tasks-component.c:492
-#: ../mail/em-folder-tree.c:2132 ../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:955
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-calendar-table.c:1610
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
-#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
-#: ../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:668
-#: ../calendar/gui/dialogs/comp-editor.c:2084
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../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:535
-msgid "Failed to authenticate.\n"
-msgstr "è®¤è¯?å¤±è´¥ã??\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
-#, 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:441
-#: ../plugins/publish-calendar/publish-calendar.c:191
-#: ../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 "è¡¥å?¨ URI å??è¡¨ç?? EFolderList xml"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "è¡¥å?¨ URI å??è¡¨ç?? 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:80
-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 "Always _show address of the autocompleted contact"
-msgstr "æ?»æ?¯æ?¾ç¤ºè?ªå?¨è¡¥å?¨ç??è??ç³»äººç??å?°å??(_S)"
-
-#: ../addressbook/gui/component/autocompletion-config.c:180
-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 "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:4
-msgid "5"
-msgstr "5"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
-#: ../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:9
-msgid "<b>Type:</b>"
-msgstr "<b>ç±»å??ï¼?</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "æ·»å? å?°å??ç°¿"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "æ?»æ?¯"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-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
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-msgid "B_rowse this book until limit reached"
-msgstr "æµ?è§?æ¤å?°å??ç°¿ç?´å?°è¾¾å?°æ??é??(_R)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "å?ºæ?¬"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "è¯?å?«æ?§å??ç§°"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "ç?µå?é?®ä»¶å?°å??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution å°?ä½¿ç?¨æ¤ç?µå?é?®ä»¶å?°å??å?¨æ??å?¡å?¨ä¸?å¯¹æ?¨è¿?è¡?è®¤è¯?ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "æ?¥æ?¾å?¯è?½ç??æ??ç´¢å?ºç¡?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-msgid "Lo_gin:"
-msgstr "ç?»å½?(_G)ï¼?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "ä»?ä¸?"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "ä¸?å? å¯?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "ä¸?æ¬¡"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "SSL å? å¯?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search Filter"
-msgstr "æ??ç´¢è¿?æ»¤å?¨"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search _base:"
-msgstr "æ??ç´¢å?ºç¡?(_B)ï¼?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "Search _filter:"
-msgstr "æ??ç´¢è¿?æ»¤å?¨(_F)ï¼?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "æ??ç´¢è¿?æ»¤å?¨"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"æ??ç´¢è¿?æ»¤å?¨æ?¯æ??æ?§è¡?æ??ç´¢æ?¶è¦?æ??ç´¢ç??å¯¹è±¡ç±»å??ã??å¦?æ??æ²¡æ??ä¿®æ?¹è¿?ç??è¯?ï¼?é»?è®¤æ??å?µä¸?æ??ç´¢"
-"å°?ä¼?å?¨â??ä¸ªäººâ??ç±»å??ç??å¯¹è±¡ç±»å??ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"é??ä¸æ¤é??é¡¹æ??å?³ç?? Evolution å?ªå?¨æ?¨ç?? LDAP æ??å?¡å?¨æ?¯æ?? SSL æ?¶æ??è¿?æ?¥å?°æ?¨ç?? LDAP "
-"æ??å?¡å?¨ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"é??ä¸æ¤é??é¡¹æ??å?³ç?? Evolution å?ªå?¨æ?¨ç?? LDAP æ??å?¡å?¨æ?¯æ?? TLS æ?¶æ??è¿?æ?¥å?°æ?¨ç?? LDAP "
-"æ??å?¡å?¨ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-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/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "å?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "Supported Search Bases"
-msgstr "æ?¯æ??ç??æ??ç´¢èµ·ç?¹"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "TLS å? å¯?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-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:40
-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 ""
-"æ??ç´¢è??å?´å®?ä¹?äº?æ?¨æ?³è¦?å?¨ç?®å½?æ ?ä¸æ??ç´¢å¤?æ·±ã??æ??ç´¢è??å?´è?¥ä¸ºâ??å?çº§â??ï¼?å??å°?å??å?«æ?¨æ??å®?ç??"
-"æ??ç´¢å?ºç¡?ä¸?æ??å±?ç??å?¨é?¨é¡¹ã??æ??ç´¢è??å?´è?¥ä¸ºâ??ä¸?çº§â??ï¼?å??å?ªä¼?å??å?«æ?¨æ??å®?ç??æ??ç´¢å?ºç¡?ä¹?ä¸?ä¸?"
-"çº§ç??é¡¹ç?®ã??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-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:42
-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:43
-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/ldap-config.glade.h:44
-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:45
-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/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "ä½¿ç?¨å·²è¯?å?«ç??å§?å??(DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "ä½¿ç?¨ç?µå?é?®ä»¶å?°å??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "å?¯è?½æ?¶"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "æ·»å? å?°å??ç°¿(_A)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-msgid "_Download limit:"
-msgstr "ä¸?è½½é??å?¶(_D)ï¼?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-msgid "_Find Possible Search Bases"
-msgstr "æ?¥æ?¾å?¯è?½ç??æ??ç´¢å?ºç¡?(_F)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:52
-msgid "_Login method:"
-msgstr "ç?»å½?æ?¹å¼?(_L)ï¼?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
-#: ../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:54
-msgid "_Port:"
-msgstr "ç«¯å?£(_P)ï¼?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:55
-msgid "_Search scope:"
-msgstr "æ??ç´¢è??å?´(_S)ï¼?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
-msgid "_Server:"
-msgstr "æ??å?¡å?¨(_S)ï¼?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-msgid "_Timeout:"
-msgstr "è¶?æ?¶(_T)ï¼?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:58
-msgid "_Use secure connection:"
-msgstr "ä½¿ç?¨å®?å?¨è¿?æ?¥(_U)ï¼?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:59
-msgid "cards"
-msgstr "å??ç??"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:671
-#: ../plugins/google-account-setup/google-contacts-source.c:338
-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>Other</b>"
-msgstr "<b>å?¶å®?</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Telephone</b>"
-msgstr "<b>ç?µè¯?</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Web Addresses</b>"
-msgstr "<b>Web å?°å??</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Work</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:1834
+msgid "Anniversary"
+msgstr "çºªå¿µæ?¥"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
+#. 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:1833 ../shell/main.c:113
+msgid "Birthday"
+msgstr "ç??æ?¥"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../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:266
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../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:311
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1265
+#: ../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:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:591
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2497
 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:808
+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
-#: ../composer/e-msg-composer.c:2473
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../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/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Instant Messaging"
+msgstr "å?³æ?¶é??è®¯"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../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:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+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:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+#: ../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:452
+#: ../plugins/groupwise-features/camel-gw-listener.c:567
+msgid "Notes"
+msgstr "ç¬?è®°"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1542
+msgid "Other"
+msgstr "å?¶å®?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "ä¸ªäººä¿¡æ?¯"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "ç?µè¯?"
 
+#: ../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.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../modules/mail/e-mail-shell-migrate.c:957
 msgid "Work"
 msgstr "å·¥ä½?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Address:"
 msgstr "å?°å??(_A)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Anniversary:"
 msgstr "å?¨å¹´(_A)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Assistant:"
 msgstr "å?©æ??(_A)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Birthday:"
 msgstr "ç??æ?¥(_B)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1893
+#: ../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:1928
 msgid "_Calendar:"
 msgstr "æ?¥å??(_C)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_City:"
 msgstr "å??å¸?(_C)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Company:"
 msgstr "å?¬å?¸(_C)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Country:"
 msgstr "å?½å®¶/å?°å?º(_C)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Department:"
 msgstr "é?¨é?¨(_D)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_File under:"
 msgstr "å?æ¡£ä¸º(_F)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Free/Busy:"
 msgstr "å¿?/é?²(_F)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Home Page:"
 msgstr "ä¸»é¡µ(_H)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Manager:"
 msgstr "ç»?ç??(_M)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Notes:"
-msgstr "æ³¨é??(_N)ï¼?"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Office:"
 msgstr "å??å?¬å®¤(_O)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
 msgstr "é?®æ?¿é?®ç®±(_P)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "è??ä¸?(_P)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Spouse:"
 msgstr "é??å?¶(_S)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "å·?/ç??(_S)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../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:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Video Chat:"
 msgstr "è§?é¢?è??å¤©(_V)ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "æ?¿æ??æ?¥æ?¶ HTML é?®ä»¶(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Web Log:"
 msgstr "_Web æ?¥å¿?ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: ../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:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Zip/Postal Code:"
 msgstr "é?®æ?¿ç¼?ç ?(_Z)ï¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "å?°å??"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
+#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:338
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "å§?å??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:339
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1285
+#: ../addressbook/gui/widgets/e-addressbook-model.c:523
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
-#: ../widgets/text/e-text.c:3689
+#: ../widgets/table/e-cell-text.c:1829 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "å?¯ç¼?è¾?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "ç¾?å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "é?¿å¯?æ±?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "é?¿å°?å·´å°¼äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "é?¿å°?å??å?©äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "ç¾?æ´²è?¨æ?©äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "å®?é??å°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "å®?å?¥æ??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "å®?å?æ??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "å??æ??æ´²"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "å®?æ??ç??å??å·´å¸?è¾¾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "é?¿æ ¹å»·"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "äº?ç¾?å°¼äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "é?¿é²?å·´å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "æ¾³å¤§å?©äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "å¥¥å?°å?©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "é?¿å¡?æ??ç??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "å·´å??é©¬ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "å·´æ??å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "å?å? æ??å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "å·´å·´å¤?æ?¯å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "ç?½ä¿?ç½?æ?¯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "æ¯?å?©æ?¶"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "ä¼¯å?©å?¹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "è´?å®?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "ç?¾æ??å¤§ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "ä¸?ä¸¹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "ç?»å?©ç»´äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "æ³¢æ?¯å°¼äº?å??é»?èµ?å?¥ç»´çº³"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "å??è?¨ç?¦çº³"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "å¸?ç»´å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "å·´è¥¿"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "è?±å±?å?°åº¦æ´?å?°å?º"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "æ??è?±å¾·é²?è?¨å?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "ä¿?å? å?©äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "å¸?å?ºçº³æ³?ç´¢"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "å¸?é??è¿ª"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "æ?¬å??å¯¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "å??éº¦é??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "å? æ?¿å¤§"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "ä½?å¾?è§?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "å¼?æ?¼ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "ä¸é??å?±å??å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "ä¹?å¾?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "æ?ºå?©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "ä¸å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "å?£è¯?å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "ç§?ç§?æ?¯ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "å?¥ä¼¦æ¯?äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "ç§?æ?©ç½?ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "å??æ??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "å??æ??äººæ°?æ°?ä¸»å?±å??å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "åº?å??ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "å?¥æ?¯è¾¾é»?å? "
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "ç§?ç?¹è¿ªç?¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "å??ç½?å?°äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "å?¤å·´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "å¡?æµ¦è·¯æ?¯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "æ?·å??å?±å??å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "ä¸¹éº¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "å??å¸?æ??ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "å¤?ç±³å°¼å? "
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "å¤?ç±³å°¼å? å?±å??å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "å??ç??å¤?å°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "å??å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "è?¨å°?ç?¦å¤?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "èµ¤é??å? å??äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "å??ç«?ç?¹é??äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "ç?±æ²?å°¼äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "å??å¡?ä¿?æ¯?äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "ç¦?å??å?°ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "æ³?ç½?ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "æ??æµ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "è?¬å?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "æ³?å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "æ³?å±?å?äº?é?£"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "æ³?å±?æ³¢å?©å°¼è¥¿äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "æ³?å±?å??é?¨å?°å?º"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "å? è?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "å??æ¯?äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "æ ¼é²?å??äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "å¾·å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "å? çº³"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "ç?´å¸?ç½?é??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "å¸?è??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "æ ¼é?µå?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "æ ¼æ??çº³è¾¾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "ç??å¾·ç½?æ?®å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "å?³å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "å?±å?°é©¬æ??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "æ ¼æ?©è¥¿å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "å? å??äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "å? å??äº?æ¯?ç»?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "å?äº?é?£"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "æµ·å?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "èµ«å¾·å??éº¦å??å??çº³ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "å?£åº§"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "æ´ªé?½æ??æ?¯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "ä¸å?½é¦?æ¸¯ç?¹å?«è¡?æ?¿å?º"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "å??ç??å?©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "å?°å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "å?°åº¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "å?°åº¦å°¼è¥¿äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "ä¼?æ??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "ä¼?æ??å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "ç?±å°?å?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "Isle of Man"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "ä»¥è?²å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "æ??å¤§å?©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "ç??ä¹°å? "
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "æ?¥æ?¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "æ?°å°?è¥¿"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "çº¦æ?¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "å??è?¨å??æ?¯å?¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "è?¯å°¼äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "å?ºé??å·´æ?¯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "é?©å?½äººæ°?æ°?ä¸»å?±å??å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "é?©å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "ç§?å¨?ç?¹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "å??å°?å??æ?¯æ?¯å?¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "è??æ??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "æ??è?±ç»´äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "é»?å·´å«©"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "è?±ç´¢æ??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "å?©æ¯?é??äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "å?©æ¯?äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "å??æ?¯æ?¦å£«ç?»"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "ç«?é?¶å®?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "å?¢æ£®å ¡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "ä¸å?½æ¾³é?¨ç?¹å?«è¡?æ?¿å?º"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "é©¬å?¶é¡¿"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "é©¬è¾¾å? æ?¯å? "
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "é©¬æ??ç»´"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "é©¬æ?¥è¥¿äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "é©¬å°?ä»£å¤«"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "é©¬é??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "é©¬è?³ä»?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "é©¬ç»?å°?ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "é©¬æ??å°¼å?¯å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "æ¯?é??å¡?å°¼äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "æ¯?é??æ±?æ?¯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "é©¬çº¦ç?¹å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "å¢¨è¥¿å?¥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "å¯?å??ç½?å°¼è¥¿äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "æ?©å°?å¤?ç?¦å?±å??å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "æ?©çº³å?¥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "è??å?¤"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "è??ç?¹å¡?æ??ç?¹ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "æ?©æ´?å?¥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "è?«æ¡?æ¯?å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "ç¼?ç?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "çº³ç±³æ¯?äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "ç??é²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "å°¼æ³?å°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "è?·å?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "è?·å±?å®?ç??å??æ?¯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "æ?°å??é??å¤?å°¼äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "æ?°è¥¿å?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "å°¼å? æ??ç??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "å°¼æ?¥å°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "å°¼æ?¥å?©äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "çº½å??å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "è¯ºç¦?å??å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "å??é©¬é??äº?é?£ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "æ?ªå¨?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "é?¿æ?¼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "å·´å?ºæ?¯å?¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "å¸?å?³ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "å·´å??æ?¯å?¦å?°å?º"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "å·´æ?¿é©¬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "å·´å¸?äº?æ?°å? å??äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "å·´æ??å?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "ç§?é²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "è?²å?©å®¾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "ç?®ç?¹å??æ?©å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "æ³¢å?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "è?¡è??ç??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "æ³¢å¤?é»?å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "å?¡å¡?å°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "ç??å°¼æ±ª"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "ç½?é©¬å°¼äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "ä¿?ç½?æ?¯è??é?¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "å?¢æ?ºè¾¾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "å?£å?ºå¾·å??å??ç»´æ?¯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "å?£å?¢è¥¿äº?å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "å?£æ??æ£®ç?¹å??æ ¼æ??çº³è¾¾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "è?¨æ?©äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "å?£é©¬å??è¯º"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "å?£å¤?ç¾?å??æ?®æ??è¥¿æ¯?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "æ²?ç?¹é?¿æ??ä¼¯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "å¡?å??å? å°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "å¡?å°?ç»´äº?å??é»?å±±"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "å¡?è??å°?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "å¡?æ??å?©æ??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "æ?°å? å?¡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "æ?¯æ´?ä¼?å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "æ?¯æ´?æ??å°¼äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "æ??ç½?é?¨ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "ç´¢é©¬é??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "å??é??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "å??ä¹?æ²»äº?å??å??ä¸?æ??æ²»ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "è¥¿ç?ç??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "æ?¯é??å?°å?¡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "å?£èµ«å??æ?¿å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "å?£ç?®å??å°?å??éº¦å??ä¼¦ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "è??ä¸¹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "è??é??å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "æ?¯ç?¦å·´å??å°?æ£?ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "æ?¯å¨?å£«å?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "ç??å?¸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "ç??å£«"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "å??å?©äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "ä¸å?½å?°æ¹¾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "å¡?å??å??æ?¯å?¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "å?¦æ¡?å°¼äº?è??é?¦å?±å??å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "æ³°å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "ä¸?å¸?æ±¶"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "å¤?å?¥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "æ??å??å?³ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "æ±¤å? "
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "ç?¹é??å°¼è¾¾å??å¤?å·´å?¥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "çª?å°¼æ?¯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "å??è?³å?¶"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "å??åº?æ?¼æ?¯å?¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "ç?¹å??æ?¯å??å?¯ç§?æ?¯ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "å?¾ç?¦å?¢"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "ä¹?å¹²è¾¾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "ä¹?å??å?°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "é?¿æ??ä¼¯è??å??é??é?¿å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "è?±å?½"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "ç¾?å?½å°?å??å¤?å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "ä¹?æ??å?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "ä¹?å?¹å?«å??æ?¯å?¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "å?ªç?¦é?¿å?¾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "å§?å??ç??æ??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "è¶?å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "è?±å±?å¤?å¥³ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "ç¾?å±?å¤?å¥³ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "ç?¦å?©æ?¯å??å¯?å?¾çº³ç¾¤å²?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "è¥¿æ??å??æ??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "ä¹?é?¨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "èµ?æ¯?äº?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "æ´¥å·´å¸?é?¦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "å§?å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL å?³æ?¶é??è®¯ç¨?åº?"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "é??è??é??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu å?³æ?¶é??è®¯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
-msgid "ICQ"
-msgstr "ICQ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
-msgid "Skype"
-msgstr "Skype"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "æ??å?¡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "ä½?ç½®"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "ç?¨æ?·å??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
-msgid "Home"
-msgstr "å®¶åº"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2259
-msgid "Other"
-msgstr "å?¶å®?"
-
-#: ../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:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "é??è??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:369
+msgid "Error adding contact"
+msgstr "æ·»å? è??ç³»äººå?ºé??"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:224
+msgid "Error modifying contact"
+msgstr "ä¿®æ?¹è??ç³»äººå?ºé??"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:238
+msgid "Error removing contact"
+msgstr "å? é?¤è??ç³»äººå?ºé??"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:297
 msgid "Source Book"
 msgstr "æ?¥æº?å?°å??ç°¿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:304
 msgid "Target Book"
 msgstr "ç?®æ ?å?°å??ç°¿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Is New Contact"
 msgstr "ä¸ºæ?°è??ç³»äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:325
 msgid "Writable Fields"
 msgstr "å?¯å??å??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:332
 msgid "Required Fields"
 msgstr "å¿?é??å??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:346
 msgid "Changed"
 msgstr "å·²æ?´æ?¹"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:601
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2492
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "è??ç³»äººç¼?è¾?å?¨ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "Please select an image for this contact"
 msgstr "è¯·é??æ?©æ¤è??ç³»äººç??å?¾å??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
 msgid "_No image"
 msgstr "æ? å?¾å??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3163
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2604,255 +614,209 @@ msgstr ""
 "è??ç³»äººæ?°æ?®æ? æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3167
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "â??%sâ??ç??æ ¼å¼?æ? æ??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3174
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sâ??%sâ??ç??æ ¼å¼?æ? æ??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3200
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ??%sâ??ä¸ºç©º"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3214
 msgid "Invalid contact."
 msgstr "æ? æ??ç??è??ç³»äººã??"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "å¿«é??æ·»å? è??ç³»äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "ç¼?è¾?å?¨å??(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "å?¨å??(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "ç?µå?é?®ä»¶(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../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 "æ?¨ç¡®å®?è¦?å? é?¤è??ç³»äººå??è¡¨(%s)å??ï¼?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??ç³»äººå??è¡¨å??ï¼?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??ç³»äºº(%s)å??ï¼?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??ç³»äººå??ï¼?"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "å?°å?? _2ï¼?"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "å??å¸?(_T)ï¼?"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "å?½å®¶/å?°å?º(_Y)ï¼?"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "å®?æ?´å?°å??"
+#: ../addressbook/gui/contact-editor/eab-editor.c:167
+#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:355
+#, fuzzy
+msgid "Shell"
+msgstr "å¡?è??å°?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "é?®æ?¿ç¼?ç ?(_Z)ï¼?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:356
+msgid "The EShell singleton"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "å??å£«"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Esq."
 msgstr "å??ç??"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../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:4
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "æ??è¾?"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
 msgid "Miss"
 msgstr "å°?å§?"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
 msgid "Mr."
 msgstr "å??ç??"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
 msgid "Mrs."
 msgstr "å¤«äºº"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
 msgid "Ms."
 msgstr "å¥³å£«"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
 msgid "Sr."
 msgstr "é?¿è¾?"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "å§?(_F)ï¼?"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "å??(_L)ï¼?"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "ä¸é?´å??(_M)ï¼?"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "å??ç¼?(_S)ï¼?"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "æ·»å? å?³æ?¶é??è®¯è´¦æ?·"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "è´¦æ?·å??(_A)ï¼?"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "å?³æ?¶é??è®¯æ??å?¡(_I)ï¼?"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "ä½?ç½®(_L)ï¼?"
-
-#: ../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:695
 msgid "Contact List Editor"
 msgstr "è??ç³»äººå??è¡¨ç¼?è¾?å?¨"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
-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:788
 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:936
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1343
 msgid "_Members"
 msgstr "æ??å??(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1183
+msgid "Error adding list"
+msgstr "æ·»å? å??è¡¨å?ºé??"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1197
+msgid "Error modifying list"
+msgstr "ä¿®æ?¹å??è¡¨å?ºé??"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1211
+msgid "Error removing list"
+msgstr "å? é?¤å??è¡¨å?ºé??"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1255
+#: ../addressbook/gui/widgets/e-addressbook-model.c:513
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Book"
 msgstr "å?°å??ç°¿"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1275
 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
+#: ../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?"
@@ -2860,69 +824,70 @@ msgstr ""
 "æ¤è??ç³»äººç??å§?å??æ??å?°å??å·²ç»?å?¨æ?¬æ??ä»¶å¤¹ä¸å?å?¨äº?ã??\n"
 "æ?¨ä¸?å®?è¦?æ·»å? å??ï¼?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../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:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 msgstr "å??å¹¶è??ç³»äºº"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
-msgid "Email"
-msgstr "ç?µå?é?®ä»¶"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../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:983
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
 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:990
 msgid "Email begins with"
 msgstr "é?®ä»¶ä»¥æ¤å¼?å¤´"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 msgid "Name contains"
 msgstr "å§?å??å?«æ??"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "æ? è??ç³»äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ä¸ªè??ç³»äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-addressbook-model.c:308
+msgid "Error getting book view"
+msgstr "è?·å??å??ç°¿è§?å?¾å?ºé??"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:533
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
 msgid "Query"
 msgstr "æ?¥è¯¢"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
-msgid "Error getting book view"
-msgstr "è?·å??å??ç°¿è§?å?¾å?ºé??"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:707
+msgid "Search Interrupted"
+msgstr "æ??ç´¢ä¸æ?äº?"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
+#: ../addressbook/gui/widgets/e-addressbook-view.c:560
+#: ../calendar/gui/e-calendar-table.c:877 ../calendar/gui/e-memo-table.c:660
+#: ../modules/calendar/e-memo-shell-content.c:601
+#: ../modules/calendar/e-task-shell-content.c:624
+#: ../widgets/table/e-table-click-to-add.c:505
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3354
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
-#: ../widgets/text/e-text.c:3553
+#: ../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
 msgid "Model"
 msgstr "æ¨¡å??"
 
@@ -2930,114 +895,61 @@ 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:570
+#: ../calendar/gui/e-calendar-table.c:888 ../calendar/gui/e-memo-table.c:671
+#, fuzzy
+msgid "Shell View"
+msgstr "é??æ?©è§?å?¾ï¼?%s"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Source"
 msgstr "æ?¥æº?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:524
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Type"
-msgstr "ç±»å??"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
-msgid "Save as vCard..."
-msgstr "å?¦å?ä¸º VCard..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "æ??å¼?(_O)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "_New Contact..."
-msgstr "æ?°å»ºè??ç³»äºº(_N)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-msgid "New Contact _List..."
-msgstr "æ?°å»ºè??ç³»äººå??è¡¨(_L)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1040
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??ç³»äººå??è¡¨å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Save as vCard..."
-msgstr "å?¦å?ä¸º vCard(_S)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1044
+msgid "Are you sure you want to delete this contact list?"
+msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??ç³»äººå??è¡¨å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contact"
-msgstr "è½¬å??è??ç³»äºº(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1048
+#, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??ç³»äººå??è¡¨(%s)å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "_Forward Contacts"
-msgstr "è½¬å??è??ç³»äºº(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1054
+msgid "Are you sure you want to delete these contacts?"
+msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??ç³»äººå??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to Contact"
-msgstr "ç»?è??ç³»äººå??ä¿¡ä»¶(_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1058
+msgid "Are you sure you want to delete this contact?"
+msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??ç³»äººå??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to List"
-msgstr "ç»?å??è¡¨å??ä¿¡ä»¶(_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1062
+#, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??ç³»äºº(%s)å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "Send _Message to Contacts"
-msgstr "ç»?è??ç³»äººå??ä¿¡ä»¶(_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1224
+#, 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:945
-msgid "_Print"
-msgstr "æ??å?°(_P)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Cop_y to Address Book..."
-msgstr "å¤?å?¶å?°å?°å??ç°¿(_Y)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-msgid "Mo_ve to Address Book..."
-msgstr "ç§»è?³å?°å??ç°¿(_V)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-msgid "Cu_t"
-msgstr "å?ªå??(_T)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "å¤?å?¶(_C)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-msgid "P_aste"
-msgstr "ç²?è´´(_A)"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Any Category"
-msgstr "ä»»ä½?ç±»å?«"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1229
+msgid "_Don't Display"
+msgstr "ä¸?æ?¾ç¤º(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
-msgid "Unmatched"
-msgstr "æ? å?¹é??"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1230
+msgid "Display _All Contacts"
+msgstr "æ?¾ç¤ºå?¨é?¨è??ç³»äºº(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "å?©æ??"
 
@@ -3066,8 +978,7 @@ msgid "Car Phone"
 msgstr "è½¦è½½ç?µè¯?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../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
@@ -3075,7 +986,7 @@ msgid "Categories"
 msgstr "ç±»å?«"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "å?¬å?¸"
 
@@ -3124,22 +1035,22 @@ msgid "Journal"
 msgstr "æ?¥è®°"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../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:646
+#: ../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:599
+#: ../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:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "æ³¨é??"
 
@@ -3168,14 +1079,13 @@ msgid "Radio"
 msgstr "æ?¶é?³æ?º"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:536
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "è§?è?²"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "é??å?¶"
 
@@ -3194,6 +1104,7 @@ msgid "Telex"
 msgstr "ç?µä¼ "
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:520
 msgid "Title"
 msgstr "å¤´è¡?"
 
@@ -3205,63 +1116,59 @@ msgstr "å??ä½?"
 msgid "Web Site"
 msgstr "ç½?ç«?"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/table/e-table-click-to-add.c:519
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:992
-#: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
+#: ../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
 msgid "Width"
 msgstr "å®½åº¦"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:985
-#: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/table/e-table-click-to-add.c:526
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
+#: ../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
 msgid "Height"
 msgstr "é«?åº¦"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "æ??ç?¦ç?¹"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "å??"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "å??å??"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "æ??å?æ¨¡å??"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 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:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
@@ -3271,7 +1178,7 @@ msgstr ""
 "\n"
 "æ£å?¨æ??ç´¢è??ç³»äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3285,7 +1192,7 @@ msgstr ""
 "\n"
 "æ??å?¨æ¤å??å?»ä»¥å??å»ºæ?°è??ç³»äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:185
 msgid ""
 "\n"
 "\n"
@@ -3299,7 +1206,7 @@ msgstr ""
 "\n"
 "è¯·å?¨æ¤å??å?»ä»¥å??å»ºæ?°è??ç³»äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3309,7 +1216,7 @@ msgstr ""
 "\n"
 "æ??ç´¢è??ç³»äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -3319,256 +1226,305 @@ msgstr ""
 "\n"
 "æ?¬è§?å?¾ä¸æ²¡æ??å?¯æ?¾ç¤ºç??é¡¹ã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:520
 msgid "Adapter"
 msgstr "é??é??å?¨"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "å·¥ä½?ç?µå?é?®ä»¶"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "å®¶åºç?µå?é?®ä»¶"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "å?¶å®?ç?µå?é?®ä»¶"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "å·²é??æ?©"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "æ??å??æ ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
-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:2752
-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:624
-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 å¼ å??ç??"
+
+#: ../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/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../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:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:362
+msgid "Copy the email address to the clipboard"
+msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??å?°å?ªè´´æ?¿"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:367
+msgid "_Send New Message To..."
+msgstr "æ??æ?°ä¿¡å??é??å?°(_S)..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:369
+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:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../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:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../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:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "é?¨é?¨"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "è??ä¸?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "è§?é¢?è??å¤©"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2512
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:246
+#: ../modules/calendar/e-cal-shell-view.c:475
+#: ../plugins/groupwise-features/camel-gw-listener.c:420
+#: ../plugins/groupwise-features/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:565
+#: ../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:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../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:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../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:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "ä¼ ç??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../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:576
 msgid "Home Page"
 msgstr "ä¸»é¡µ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "Web æ?¥å¿?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2538
-msgid "Birthday"
-msgstr "ç??æ?¥"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2539
-msgid "Anniversary"
-msgstr "çºªå¿µæ?¥"
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#. orange
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/calendar/e-cal-shell-backend.c:167
+#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-memo-shell-backend.c:152
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:156
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/mail/e-mail-shell-migrate.c:958
+#: ../plugins/email-custom-header/email-custom-header.c:322
+msgid "Personal"
+msgstr "ä¸ªäºº"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "è??ç§°"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "ä¸»é¡µ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "Blog"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1042
+#: ../widgets/misc/e-web-view.c:708
+#, 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/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2561
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/dialogs/task-details-page.ui.h:1
+#: ../calendar/gui/e-cal-component-preview.c:293
+#: ../calendar/gui/e-cal-model-tasks.c:465
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-calendar-table.c:215
+#: ../calendar/gui/e-calendar-table.c:226
+#: ../calendar/gui/e-calendar-table.c:791 ../calendar/gui/print.c:2619
 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:433
+#: ../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:427
+#: ../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
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 #, fuzzy
-#| msgid ""
-#| "We were unable to open this address book. 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"
 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 "
@@ -3577,15 +1533,14 @@ 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 æ?¯å?¦å?å?¨ä»¥å??æ?¨æ?¯å?¦æ??è¶³å¤?ç??æ??é??è®¿é?®å®?ã??"
+msgstr "æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??è¯·æ£?æ?¥è·¯å¾? %s æ?¯å?¦å?å?¨ä»¥å??æ?¨æ?¯å?¦æ??è¶³å¤?ç??æ??é??è®¿é?®å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../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."
@@ -3593,19 +1548,19 @@ msgstr ""
 "æ?¬ç??æ?¬ç?? Evolution å¹¶æ²¡æ??æ?? LDAP æ?¯æ??ç¼?è¯?è¿?å?»ã??å¦?æ??æ?¨å¸?æ??å?¨ Evolution ä¸ä½¿ç?¨ "
 "LDAPï¼?å°±å¿?é¡»å®?è£?å?¯ç?¨äº? LDAP ç?? Evolution å??ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../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ï¼?ä¹?å?¯è?½æ?¯å? ä¸ºæ??å?¡å?¨å·²ç»?"
-"å?³é?ã??"
+"æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??è¿?å?¯è?½æ?¯ç?±äº?æ?¨è¾?å?¥äº?é??è¯¯ç?? 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"
@@ -3616,7 +1571,7 @@ msgstr ""
 "Evolution é??ç½®è¦?æ?¾ç¤ºç??æ?°ç?®ã??è¯·å?¨æ??ç´¢ç??æ?¶å??æ??å®?æ?´å? ä¸¥æ ¼ç??\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"
@@ -3627,465 +1582,198 @@ 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:687
-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:637
-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"
-"æ?¨ç??ç??æ?³è¦?æ?¾ç¤ºæ??æ??è??ç³»äººå??ï¼?"
-
-#: ../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:351
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s å·²ç»?å?å?¨\n"
-"æ?¨æ??ç®?è¦?ç??å®?å??ï¼?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
-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:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "è??ç³»äºº"
-
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:245
 msgid "Select Address Book"
 msgstr "é??æ?©å?°å??ç°¿"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 msgid "list"
 msgstr "å??è¡¨"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
 msgid "Move contact to"
 msgstr "å°?è??ç³»äººç§»è?³"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Copy contact to"
 msgstr "å°?è??ç³»äººå¤?å?¶å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "Move contacts to"
 msgstr "å°?è??ç³»äººç§»è?³"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 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:293
-msgid "Querying Address Book..."
-msgstr "æ£å?¨æ?¥è¯¢å?°å??ç°¿..."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "æ??å?¦å¤? %d ä¸ªè??ç³»äººã??"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "æ?¾ç¤ºå®?æ?´ vCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "æ?¾ç¤ºç´§å?? vCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "ä¿?å?å?¨å?°å??ç°¿ä¸"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "å??ç??è§?å?¾"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:511
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "æ£å?¨å¯¼å?¥..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV å?? Tab å¯¼å?¥å?¨"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV å?? Tab å¯¼å?¥å?¨"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV å?? Tab å¯¼å?¥å?¨"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:678
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP æ?°æ?®äº¤æ?¢æ ¼å¼?(.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF å¯¼å?¥å?¨"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vfg, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard å¯¼å?¥å?¨"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "ç»?å°¾ç©ºç?½æ ¼å¼?ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "é?®ä»¶ä½?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "åº?é?¨ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "å°ºå¯¸ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "å?ä½?(_O)..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "å?ä½?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "é¡µè??ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "æ ¼å¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "é¡µç??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "é¡µç??/é¡µè??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "æ ?é¢?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "æ¯?å°?ä¿¡ç??æ ?é¢?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "é«?åº¦ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "ä¸?ä¸ªç´§æ?¥ä¸?ä¸ª"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "å??å?«ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "æ¨ªå??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "å·¦ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "æ??è¾¹æ?¾ç¤ºå?æ¯?æ ?ç¾"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "è¾¹ç??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "å??æ?°ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "é??é¡¹"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "æ?¹å??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "é¡µé?¢"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "é¡µé?¢è®¾ç½®ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "çº¸å¼ "
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "çº¸å¼ æ?¥æº?ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "çºµå??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "é¢?è§?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "ç?¨ç?°åº¦é?´å½±æ??å?°"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "å¥?æ?°é¡µå??å??"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "å?³ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "è??ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "é?´å½±"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "å¤§å°?ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "ä»?æ?°é¡µå¼?å§?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "æ ·å¼?å??ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "é¡¶é?¨ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "ç±»å??ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "å®½åº¦ï¼?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "å?ä½?(_F)..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "æ? æ³?æ??å¼?æ??ä»¶"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "æ? æ³?è?·å¾?å?°å??ç°¿å??è¡¨"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "æ??å¼?å?°å??ç°¿å¤±è´¥"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "æ??å®?ç?¨æ?¥å??ä»£æ ?å??è¾?å?ºç??è¾?å?ºæ??ä»¶"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "è¾?å?ºæ??ä»¶"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "å??å?ºæ?¬å?°å?°å??ç°¿æ??ä»¶å¤¹"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "å°?å??ç??æ?¾ç¤ºä¸º vcard è¿?æ?¯ csv æ??ä»¶"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "ä»¥å¼?æ¥æ¨¡å¼?å¯¼å?º"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "å¼?æ¥æ¨¡å¼?ä¸ä¸?ä¸ªè¾?å?ºæ??ä»¶ä¸ç??å??ç??æ?°ï¼?é»?è®¤å¤§å°?ä¸º 100ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "æ?°å?"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "å?½ä»¤è¡?å??æ?°é??è¯¯ï¼?è¯·ä½¿ç?¨ --help é??é¡¹æ?¥ç??ç?¨æ³?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "ä»?æ?¯æ?? csv æ?? vcard æ ¼å¼?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "å?¨å¼?æ¥æ¨¡å¼?ä¸ï¼?è¾?å?ºå¿?é¡»æ?¯æ??ä»¶ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "å?¨æ?®é??æ¨¡å¼?ä¸ï¼?ä¸?åº?è¯¥æ??å¤§å°?é??é¡¹ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 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:530
+msgid "Failed to authenticate.\n"
+msgstr "è®¤è¯?å¤±è´¥ã??\n"
+
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:510
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "è¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
+
+#: ../addressbook/util/addressbook.c:225
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:518
+#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../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}â??æ?¯ä¸?ä¸ªå?ªè¯»æ?¥å??ï¼?ä¸?è?½è¢«ç¼?è¾?ã??è¯·ä»?æ?¥å??å??è¡¨ç??ä¾§è¾¹æ ?é??é??æ?©ä¸?ä¸ªä¸?å??ç??æ?¥å??ã??"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
@@ -4151,266 +1839,281 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤æ ?é¢?ä¸ºâ??{0}â??ç??çº¦ä¼?å??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:17
+#, fuzzy
+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
+#: ../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
+#: ../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
+#: ../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
+#: ../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
+#: ../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
+#: ../calendar/calendar.error.xml.h:50
 msgid "Save Appointment"
 msgstr "ä¿?å?çº¦ä¼?"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
+#, fuzzy
+msgid "Save Meeting"
+msgstr "æ?°ä¼?è®®"
+
+#: ../calendar/calendar.error.xml.h:52
 msgid "Save Memo"
 msgstr "ä¿?å?å¤?å¿?"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
 msgid "Save Task"
 msgstr "ä¿?å?ä»»å?¡"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:54
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "å??é??æ?´æ?°ç??ä¿¡æ?¯å°?å??è®¸å?¶ä»?å?ºå¸è??ä½¿ä»?ä»¬ç??æ?¥å??ä¿?æ??æ??æ?°ã??"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "å??é??æ?´æ?°ç??ä¿¡æ?¯å??è®¸å?¶ä»?å?ºå¸è??ä½¿ä»?ä»¬ç??ä»»å?¡å??è¡¨ä¿?æ??æ??æ?°ã??"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:57
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "é??ä»¶æ£å?¨ä¸?è½½ä¸ã??ä¿?å?çº¦ä¼?å°?ä½¿å¾?çº¦ä¼?ä¿?å?æ?¶æ? æ³?å??å?«å??ç»ç??é??ä»¶ã??"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:58
 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:59
 msgid "Some features may not work properly with your current server."
 msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?å?¨æ?¨ç?®å??ç??æ??å?¡å?¨ä¸?å·¥ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution æ?¥å??å¼?å¸¸é??å?ºã??"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution æ?¥å??å¼?å¸¸é??å?ºã??"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:62
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution å¤?å¿?å¼?å¸¸é??å?ºã??"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:63
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution ä»»å?¡å¼?å¸¸é??å?ºã??"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:64
 msgid "The calendar is not marked for offline usage."
 msgstr "æ?¥å??æ?ªæ ?ä¸ºè?±æ?ºä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:65
 msgid "The memo list is not marked for offline usage."
 msgstr "å¤?å¿?å??è¡¨æ?ªæ ?ä¸ºè?±æ?ºä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:66
 msgid "The task list is not marked for offline usage."
 msgstr "ä»»å?¡å??è¡¨æ?ªæ ?ä¸ºè?±æ?ºä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:67
 msgid "This calendar will be removed permanently."
 msgstr "æ¤æ?¥å??å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:68
 msgid "This memo list will be removed permanently."
 msgstr "æ¤å¤?å¿?å??è¡¨å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:69
 msgid "This task list will be removed permanently."
 msgstr "æ¤ä»»å?¡å??è¡¨å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:70
 msgid "Unable to load the calendar"
 msgstr "æ? æ³?è£?å?¥æ?¥å??"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this appointment?"
 msgstr "æ?¨æ?³è¦?ä¿?å?å¯¹çº¦ä¼?ç??æ?´æ?¹å??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:72
+#, fuzzy
+msgid "Would you like to save your changes to this meeting?"
+msgstr "æ?¨æ?³è¦?ä¿?å?å¯¹æ¤å¤?å¿?ç??æ?´æ?¹å??ï¼?"
+
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to save your changes to this memo?"
 msgstr "æ?¨æ?³è¦?ä¿?å?å¯¹æ¤å¤?å¿?ç??æ?´æ?¹å??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to save your changes to this task?"
 msgstr "æ?¨æ?³è¦?ä¿?å?å¯¹æ¤ä»»å?¡ç??æ?´æ?¹å??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?ä¸ºæ¤å¤?å¿?å??é??å??æ¶?é??ç?¥ï¼?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?¨é?¨å?ºå¸è??å??é??å??æ¶?é??ç?¥ï¼?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸è??å??é??ä¼?è®®é??è¯·ï¼?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 msgid "Would you like to send this task to participants?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?å°?æ¤ä»»å?¡å??é??ç»?å?ºå¸è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸è??å??é??æ?´æ?°ç??ä¼?è®®ä¿¡æ?¯ï¼?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "Would you like to send updated task information to participants?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?ç»?å?ºå¸è??å??é??æ?´æ?°ç??ä»»å?¡ä¿¡æ?¯ï¼?"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4419,72 +2122,77 @@ msgstr ""
 "æ?¨æ£å?¨è¿?æ?¥å?°ä¸?æ?¯æ??ç?? GroupWise æ??å?¡å?¨ï¼?æ¤æ?¶ä½¿ç?¨ Evolution å?¯è?½é??å?°é?®é¢?ã??ä¸ºäº?"
 "å¾?å?°æ??ä½³æ??æ??ï¼?æ??å?¡å?¨åº?è¯¥å??çº§å?°æ?¯æ??ç??ç??æ?¬ã??"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:82
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "æ?¨å·²ç»?æ?´æ?¹äº?æ¤çº¦ä¼?ï¼?ä½?å°?æ?ªä¿?å?ã??"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:83
+#, fuzzy
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "æ?¨å·²ç»?å¯¹æ¤ä»»å?¡å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
+
+#: ../calendar/calendar.error.xml.h:84
 msgid "You have changed this task, but not yet saved it."
 msgstr "æ?¨å·²ç»?å¯¹æ¤ä»»å?¡å??å?ºäº?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:85
 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:86
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??æ?¥å??æ? æ³?ä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:87
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??å¤?å¿?å°?æ? æ³?ä½¿ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:88
 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:89
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Discard Changes"
 msgstr "ä¸¢å¼?æ?´æ?¹(_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:90 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "ä¿?å?(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:91
 msgid "_Save Changes"
 msgstr "ä¿?å?æ?´æ?¹(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../calendar/calendar.error.xml.h:92
+#: ../composer/mail-composer.error.xml.h:32 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "å??é??(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:93
 msgid "_Send Notice"
 msgstr "å??é??é??ç?¥(_S)"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:94
 msgid "{0}."
 msgstr "{0}ã??"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "å??å?²å¤?æ?¥äº?ä»¶ï¼?"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
+#: ../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:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "æ? æ³?å?¯å?¨ evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../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 æ?¥å??åº?ç?¨ç¨?åº?å??"
 
@@ -4498,195 +2206,126 @@ msgstr "æ? æ³?è¯»å?¥ Pilot ç??å¤?å¿?åº?ç?¨ç¨?åº?å??"
 msgid "Could not write pilot's Memo application block"
 msgstr "æ? æ³?å??å?¥ Pilot å¤?å¿?åº?ç?¨ç¨?åº?å??"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "é»?è®¤ä¼?å??çº§ï¼?"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
 #: ../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 ToDo åº?ç?¨ç¨?åº?å??"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
 #: ../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 ToDo åº?ç?¨ç¨?åº?å??"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
-msgid "Calendar and Tasks"
-msgstr "æ?¥å??å??ä»»å?¡"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:851
-#: ../calendar/gui/calendar-component.c:1325
-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:278 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:586
-#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
-msgid "Memos"
-msgstr "å¤?å¿?"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:577
-#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
-#: ../calendar/gui/tasks-control.c:498
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../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)"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../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:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:672
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../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:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:515
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-source.c:740
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "å°?æ?¶"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../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.ui.h:2
+msgid "Dismiss _All"
+msgstr "å?¨é?¨é??è¿?(_A)"
+
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1018
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
+#: ../calendar/gui/e-itip-control.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Location:"
 msgstr "ä½?ç½®ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "å??ç?¡æ?¶é?´(_T)ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "é??è¿?(_D)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../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:1065
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:111
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1642
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "å??ç?¡(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "çº¦ä¼?ä½?ç½®"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../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:32
+#: ../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:514
+#: ../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:1436
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1558
 msgid "No summary available."
 msgstr "æ²¡æ??å?¯ç?¨ç??æ??è¦?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1447
 msgid "No description available."
 msgstr "æ²¡æ??æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
 msgid "No location information available."
 msgstr "æ²¡æ??å?¯ç?¨ç??ä½?ç½®ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1498
 #, c-format
 msgid "You have %d alarms"
 msgstr "æ?¨æ?? %d ä¸ªæ??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1674
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4698,7 +2337,7 @@ msgstr ""
 "å??é??ç?µå?é?®ä»¶ã??Evolution å°?ä»¥\n"
 "æ?¾ç¤ºæ?®é??æ??ç¤ºä¼?è¯?æ¡?ä»£æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1704
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4714,20 +2353,10 @@ msgstr ""
 "\n"
 "æ?¨ç¡®ä¿¡æ?¨è¦?è¿?è¡?è¯¥ç¨?åº?å??ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 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 "æ? æ??æ?¶é?´"
@@ -4763,7 +2392,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 "å?¨ç?¶æ??æ ?ä¸æ?¾ç¤ºé??è¯¯ç??æ?¶é?´ç§?æ?°ã??"
 
@@ -4784,270 +2413,336 @@ msgid "Calendars to run alarms for"
 msgstr "è¿?è¡?æ??é??ç??æ?¥å??"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr "é??ä¸è¿?ä¸ªæ?¥å?¨ 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)."
 msgstr "å?¨æ?¶é?´æ ?ä¸ç»?å?¶ Marcus Bains çº¿ç??é¢?è?²(é»?è®¤ä¸ºç©º)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "å?¨æ?¥è§?å?¾ä¸ç»?å?¶ Marcus Bains çº¿ç??é¢?è?²ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "å?¨æ??è§?å?¾ä¸å??ç¼©å?¨æ?«"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "ç¡®è®¤é??æ¯?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr "ä¸?ä¸ªæ?°äº?ä»¶ç??é»?è®¤é??ç?°æ¬¡æ?°ã??-1 ä»£è¡¨æ°¸è¿?é??ç?°ã??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "æ ?ä¸ºå·¥ä½?æ?¥ç??æ?¥å?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "é»?è®¤çº¦ä¼?æ??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#, fuzzy
+msgid "Default recurrence count"
+msgstr "é»?è®¤æ??é??å??ä½?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "é»?è®¤æ??é??å??ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "é»?è®¤æ??é??å?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "ä¿?å?æ??é??é?³é¢?æ??ä»¶ç??ç?®å½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "äº?ä»¶æ¸?å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "äº?ä»¶é??æ??åº¦"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "å¿?/é?²æ??å?¡å?¨ URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "å¿?/é?²æ¨¡æ?¿ URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "æ?¥å??è§?å?¾ä¸äº?ä»¶ç??æ¸?å??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "é??è??å·²å®?æ??ç??ä»»å?¡"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "é??è??ä»»å?¡å??ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "é??è??ä»»å?¡å?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "æ°´å¹³é?¢æ?¿ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "å·¥ä½?æ?¥ç»?æ??ç??å°?æ?¶ï¼?ä»¥ 24 å°?æ?¶æ ¼å¼?è¡¨ç¤ºï¼?0 å?° 23ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 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:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../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:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
 msgstr "ä¸?æ¬¡æ??é??æ?¶é?´"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../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:30
+#: ../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:31
+#: ../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:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains çº¿"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../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:34
+#: ../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:35
+#: ../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 ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../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:37
+#: ../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
+#, fuzzy
+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:38
+#: ../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:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view horizontal pane position"
 msgstr "æ??è§?å?¾æ°´å¹³é?¢æ?¿ç??ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Month view vertical pane position"
 msgstr "æ??è§?å?¾ä¸å??ç?´é?¢æ?¿ç??ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../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:42
+#: ../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:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Overdue tasks color"
 msgstr "å»¶æ??ä»»å?¡ç??é¢?è?²"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../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:45
+#: ../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:46
+#: ../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:55
+msgid "Position of the task preview pane when oriented horizontally."
+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: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:47
-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:48
+#: ../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:49
+#: ../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:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+msgid "Primary calendar"
+msgstr "é¦?é??æ?¥å??"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+msgid "Primary memo list"
+msgstr "é¦?é??å¤?å¿?å??è¡¨"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+msgid "Primary task list"
+msgstr "é¦?é??ä»»å?¡å??è¡¨"
+
+#: ../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:51
+#: ../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:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
 msgstr "ä¿?å?æ??é??é?³é¢?ç??ç?®å½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../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:67
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "å?¨äº?ä»¶/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸æ?¾ç¤ºè¯·å??å¤?å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../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:55
+#: ../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:56
+#: ../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:57
+#: ../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:58
+#: ../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:59
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Show the \"Preview\" pane"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#, fuzzy
+msgid "Show the memo preview pane"
 msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Show the \"Preview\" pane."
-msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#, fuzzy
+msgid "Show the task preview pane"
+msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../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:62
+#: ../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:63
+#: ../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:64
+#: ../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:65
+#: ../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 ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-msgid "Tasks due today color"
-msgstr "ä»?å¤©å?°æ??ç??ä»»å?¡é¢?è?²"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task layout style"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-msgid "Tasks vertical pane position"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#, fuzzy
+msgid "Task preview pane position (horizontal)"
 msgstr "ä»»å?¡å??ç?´é?¢æ?¿ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#, fuzzy
+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:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5056,7 +2751,7 @@ msgstr ""
 "ç?¨ä½?å¿?/é?²æ?°æ?®å??å¸?ç?? URL æ¨¡æ?¿ï¼?%u å°?æ?¿æ?¢ä¸ºç?µå?é?®ä»¶ç??ç?¨æ?·é?¨å??ï¼?è?? %d å°?æ?¿æ?¢ä¸ºå??"
 "å??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../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\"."
@@ -5064,342 +2759,192 @@ msgstr ""
 "æ?¥å??ä¸æ?¥æ??å??æ?¶é?´æ??ä½¿ç?¨ç??é»?è®¤æ?¶å?ºï¼?ä»¥æ?ªç¿»è¯?ç??æ?¶å?ºæ?°æ?®åº?ä½?ç½®è¡¨ç¤ºï¼?å¦?â??Asia/"
 "Shanghaiâ??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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:72
+#: ../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:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
 msgstr "æ?¶é?´å??å?²"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
 msgstr "æ??é??ä¸?æ¬¡è¿?è¡?ç??æ?¶é?´ï¼?ä»¥ time_t æ ¼å¼?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Timezone"
 msgstr "æ?¶å?º"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../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(é??æ??)å?? 1(ä¸?é??æ??)ä¹?é?´ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
 msgstr "äº?å??å??å°?æ?¶æ?¶é?´æ ¼å¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "é»?è®¤æ??é??ç??å??ä½?ï¼?å?¯ä¸ºâ??minutesâ??ï¼?â??hoursâ??æ??â??daysâ??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../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:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+msgid "Use system timezone"
+msgstr "ä½¿ç?¨ç³»ç»?æ?¶å?º"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+
+#: ../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:82
+#: ../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:83
+#: ../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:84
+#: ../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:85
+#: ../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:86
+#: ../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:87
+#: ../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:88
+#: ../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:89
+#: ../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:90
+#: ../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:114
 msgid "Whether to set a default reminder for appointments."
 msgstr "æ?¯å?¦ä¸ºçº¦ä¼?è®¾ç½®é»?è®¤æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/ä»»å?¡/ä¼?è®®ç¼?è¾?å?¨ä¸æ?¾ç¤ºè¯·å??å¤?å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../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:93
+#: ../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:94
+#: ../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:95
+#: ../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 å°?æ?¶æ ¼å¼?è¿?æ?¯ä»¥ 12 å°?æ?¶æ ¼å¼?æ?¾ç¤ºæ?¶é?´ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../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:97
+#: ../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:98
+#: ../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:99
+#: ../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:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "å?¨æ?¾ç¤ºäº?ä»¶æ?¶ä½¿ç?¨æ?¯å?¦å¤?æ?¶å?¶æ?¶é?´ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Work days"
 msgstr "å·¥ä½?æ?¥"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end hour"
 msgstr "å·¥ä½?æ?¥ç»?æ??å°?æ?¶"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday end minute"
 msgstr "å·¥ä½?æ?¥ç»?æ??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start hour"
 msgstr "å·¥ä½?æ?¥å¼?å§?å°?æ?¶"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
 msgid "Workday start minute"
 msgstr "å·¥ä½?æ?¥å¼?å§?å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "å¤?æ?¶å?¶æ?¶é?´"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Summary contains"
-msgstr "æ¦?è¦?å?«æ??"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Description contains"
-msgstr "æ??è¿°å?«æ??"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Category is"
-msgstr "ç±»å?«ä¸º"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Comment contains"
-msgstr "æ³¨é??å?«æ??"
-
-#: ../calendar/gui/cal-search-bar.c:79
-msgid "Location contains"
-msgstr "ä½?ç½®å?«æ??"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Next 7 Days' Tasks"
-msgstr "ä¸?ä¸?å?¨ç??ä»»å?¡"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Active Tasks"
-msgstr "æ´»å?¨ä»»å?¡"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Overdue Tasks"
-msgstr "å»¶æ??ä»»å?¡"
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Completed Tasks"
-msgstr "å·²å®?æ??ä»»å?¡"
-
-#: ../calendar/gui/cal-search-bar.c:656
-msgid "Tasks with Attachments"
-msgstr "æ??é??ä»¶ç??ä»»å?¡"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Active Appointments"
-msgstr "æ´»å?¨çº¦ä¼?"
-
-#: ../calendar/gui/cal-search-bar.c:706
-msgid "Next 7 Days' Appointments"
-msgstr "ä¸?ä¸?å?¨ç??çº¦ä¼?"
-
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "æ??å?°"
-
-#: ../calendar/gui/calendar-commands.c:315
-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:321
-msgid "Purge events older than"
-msgstr "é??æ¯?è¾?æ?©ç??äº?ä»¶"
-
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:673
-#: ../plugins/google-account-setup/google-contacts-source.c:340
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "å¤©"
-
-#. Create the On the web source group
-#. Create the LDAP source group
-#. Create the Webcal source group
-#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:281
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
-#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
-msgid "On The Web"
-msgstr "ç½?ä¸?"
-
-#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "ç??æ?¥å??çºªå¿µæ?¥"
-
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:331
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "å¤©æ°?"
-
-#: ../calendar/gui/calendar-component.c:658
-msgid "_New Calendar"
-msgstr "æ?°å»ºæ?¥å??(_N)"
-
-#: ../calendar/gui/calendar-component.c:659
-#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
-#: ../mail/em-folder-tree.c:2124
-msgid "_Copy..."
-msgstr "å¤?å?¶(_C)..."
-
-#: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
-msgid "_Make available for offline use"
-msgstr "æ ?ä¸ºå?¯è?±æ?ºä½¿ç?¨(_M)"
-
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
-msgid "_Do not make available for offline use"
-msgstr "ä¸?æ ?ä¸ºå?¯è?±æ?ºä½¿ç?¨(_D)"
-
-#: ../calendar/gui/calendar-component.c:995
-msgid "Failed upgrading calendars."
-msgstr "å??çº§æ?¥å??å¤±è´¥ã??"
-
-#: ../calendar/gui/calendar-component.c:1176
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??æ?¥å??å»ºäº?ä»¶å??ä¼?è®®"
-
-#: ../calendar/gui/calendar-component.c:1192
-msgid "There is no calendar available for creating events and meetings"
-msgstr "æ²¡æ??å?¯å??å»ºäº?ä»¶å??ä¼?è®®ç??æ?¥å??"
-
-#: ../calendar/gui/calendar-component.c:1305
-msgid "Calendar Source Selector"
-msgstr "æ?¥å??æº?é??æ?©å?¨"
-
-#: ../calendar/gui/calendar-component.c:1521
-msgid "New appointment"
-msgstr "æ?°å»ºçº¦ä¼?"
-
-#: ../calendar/gui/calendar-component.c:1522
-msgctxt "New"
-msgid "_Appointment"
-msgstr "çº¦ä¼?(_A)"
-
-#: ../calendar/gui/calendar-component.c:1523
-msgid "Create a new appointment"
-msgstr "å??å»ºæ?°çº¦ä¼?"
-
-#: ../calendar/gui/calendar-component.c:1529
-msgid "New meeting"
-msgstr "æ?°å»ºä¼?è®®"
-
-#: ../calendar/gui/calendar-component.c:1530
-msgctxt "New"
-msgid "M_eeting"
-msgstr "ä¼?è®®(_E)"
-
-#: ../calendar/gui/calendar-component.c:1531
-msgid "Create a new meeting request"
-msgstr "å??å»ºä¸?æ?¡æ?°ä¼?è®®è¯·æ±?"
-
-#: ../calendar/gui/calendar-component.c:1537
-msgid "New all day appointment"
-msgstr "æ?°å»ºå?¨å¤©çº¦ä¼?"
-
-#: ../calendar/gui/calendar-component.c:1538
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "å?¨å¤©çº¦ä¼?(_P)"
-
-#: ../calendar/gui/calendar-component.c:1539
-msgid "Create a new all-day appointment"
-msgstr "å??å»ºæ?°å?¨å¤©çº¦ä¼?"
-
-#: ../calendar/gui/calendar-component.c:1545
-msgid "New calendar"
-msgstr "æ?°å»ºæ?¥å??"
-
-#: ../calendar/gui/calendar-component.c:1546
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "æ?¥å??(_N)"
-
-#: ../calendar/gui/calendar-component.c:1547
-msgid "Create a new calendar"
-msgstr "å??å»ºæ?°æ?¥å??"
+#: ../calendar/gui/cal-editor-utils.c:102
+msgid "Invalid object"
+msgstr "æ? æ??ç??å¯¹è±¡"
 
 #: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
@@ -5439,20 +2984,22 @@ msgid "Category"
 msgstr "ç±»å?«"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "å??ç±»"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
+#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-calendar-table.c:695
 #: ../calendar/gui/memotypes.xml.h:6
+#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "æ?ºå¯?"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°"
 
@@ -5471,35 +3018,43 @@ msgstr "ä¸?å?å?¨"
 msgid "Exist"
 msgstr "å?å?¨"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../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:720
+#: ../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/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:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
+#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-calendar-table.c:694
 #: ../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:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
+#: ../calendar/gui/e-calendar-table.c:693 ../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:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../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/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:354
 msgid "Summary"
 msgstr "æ¦?è¦?"
 
@@ -5519,504 +3074,521 @@ 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:30
+#: ../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:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ä¸?æ?¯"
 
-#: ../calendar/gui/comp-editor-factory.c:409
-msgid "Error while opening the calendar"
-msgstr "æ??å¼?æ?¥å??æ?¶å?ºé??"
-
-#: ../calendar/gui/comp-editor-factory.c:415
-msgid "Method not supported when opening the calendar"
-msgstr "æ??å¼?æ?¥å??ç??æ?¹æ³?ä¸?æ?¯æ??"
-
-#: ../calendar/gui/comp-editor-factory.c:421
-msgid "Permission denied to open the calendar"
-msgstr "æ²¡æ??æ??é??æ??å¼?æ?¥å??"
-
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
-msgid "Unknown error"
-msgstr "æ?ªç?¥ç??é??è¯¯"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "ç¼?è¾?æ??é??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>æ??é??</b>"
+#: ../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:818
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "æ?æ?¾å£°é?³"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>é??é¡¹</b>"
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "è¿?è¡?ç¨?åº?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>é??å¤?</b>"
+#: ../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: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/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "æ?æ?¾å£°é?³"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "å¼¹å?ºè¦å??"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+msgid "Options"
+msgstr "é??é¡¹"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "è¿?è¡?ç¨?åº?"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "é??å¤?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "å??é??ç»?ï¼?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "å??é??ç?µå?é?®ä»¶"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "å??æ?°(_A)ï¼?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "ç¨?åº?(_P)ï¼?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "é??å¤?æ??é??(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "å£°é?³(_S)ï¼?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "after"
 msgstr "ä¹?å??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "before"
 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/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
 msgid "day(s)"
 msgstr "å¤©"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#. 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:335
+#: ../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:516
+#: ../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:38
+msgid "days"
+msgstr "å¤©"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "end of appointment"
 msgstr "çº¦ä¼?ç»?æ??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "æ¯?ä¸ªé¢?å¤?æ?¶é?´"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "hour(s)"
 msgstr "å°?æ?¶"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 msgid "minute(s)"
 msgstr "å??é??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
+#: ../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 "æ·»å? (_D)"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: ../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:81
-#: ../composer/e-composer-actions.c:62
-msgid "_Suggest automatic display of attachment"
-msgstr "å»ºè®®è?ªå?¨æ?¾ç¤ºé??ä»¶(_S)"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
-msgid "Attach file(s)"
-msgstr "æ·»å? é??ä»¶"
-
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2954
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../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:370
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
-#: ../widgets/misc/e-signature-combo-box.c:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:106
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:155
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/e-cal-model-tasks.c:727
+#: ../calendar/gui/e-day-view-time-item.c:798
+#: ../calendar/gui/e-itip-control.c:1148 ../filter/e-filter-rule.c:744
+#: ../mail/em-account-editor.c:865 ../mail/em-account-editor.c:1674
+#: ../modules/mail/e-mail-junk-hook.c:88
+#: ../plugins/calendar-weather/calendar-weather.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:378
+#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/itip-formatter/itip-formatter.c:2300
+#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1677
+#: ../widgets/misc/e-dateedit.c:1894 ../widgets/misc/e-send-options.ui.h:11
+#: ../widgets/misc/e-signature-combo-box.c:75
+#: ../widgets/table/e-cell-date-edit.c:312
 msgid "None"
 msgstr "æ? "
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:182
+#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-timezone-entry.c:319
+msgid "Select..."
+msgstr "é??æ?©..."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
 msgid "Selected Calendars for Alarms"
 msgstr "å·²é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "(Shown in a Day View)"
-msgstr "(å?¨æ?¥è§?å?¾ä¸æ?¾ç¤º)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+msgid "Time and date:"
+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"
-"5 å??é??"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
+msgid "Date only:"
+msgstr "å?ªæ??æ?¥æ??ï¼?"
 
-#: ../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>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
+#, fuzzy, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "<i>%u å?? %d å°?è¢«æ?¿æ?¢ä¸ºç?µå?é?®ä»¶å?°å??ä¸ç??ç?¨æ?·å??å??å??ã??</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">è¦å??</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(å?¨æ?¥è§?å?¾ä¸æ?¾ç¤º)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">é»?è®¤å¿?/é?²æ??å?¡å?¨</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+msgid "05 minutes"
+msgstr "05 å??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../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.ui.h:5
+msgid "10 minutes"
+msgstr "10 å??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">ä»»å?¡å??è¡¨</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+msgid "15 minutes"
+msgstr "15 å??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">æ?¶é?´</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+msgid "30 minutes"
+msgstr "30 å??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">å·¥ä½?æ?¥</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+msgid "60 minutes"
+msgstr "60 å??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "è°?æ?´å¤?æ?¶å?¶æ?¶é?´(_V)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+msgid "Alerts"
+msgstr "æ??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../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:18
+#: ../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/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
+msgid "Display alarms in _notification area only"
+msgstr "å?ªå?¨é??ç?¥å?ºå??æ?¾ç¤ºæ??é??(_N)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-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:2654
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:24
+msgid "General"
+msgstr "å¸¸è§?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../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:735
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-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:34
-#: ../mail/mail-config.glade.h:114
+#: ../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:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "å?¨æ?¥(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Saturday"
 msgstr "æ??æ??å?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../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.ui.h:28
 msgid "Se_cond zone:"
 msgstr "ç¬¬äº?æ?¶å?º(_C)ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
 msgstr "æ?¾ç¤ºä¸?æ?¡æ??é??(_O)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
 msgstr "æ?¾ç¤ºä¸?æ?¡æ??é??(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../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:43
+#: ../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:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../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:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
 msgstr "å?¨å??(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../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:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:608
+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:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "æ?¶é?´æ ¼å¼?ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Tuesday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+msgid "Use s_ystem time zone"
+msgstr "æ?¾ç¤ºç³»ç»?æ?¶å?º(_Y)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
 msgstr "ä¸?å?¨å¼?å§?äº?(_K)ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+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:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 å°?æ?¶(ä¸?/ä¸?å??)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "_24 hour"
 msgstr "_24 å°?æ?¶"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../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:60
+#: ../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:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
 msgstr "ä¸?å¤©å¼?å§?(_D)ï¼?"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
 msgstr "å?¨äº?(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../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:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
 msgstr "å?¨ä¸?(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
 msgstr "å»¶æ??ä»»å?¡(_O)ï¼?"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
 msgstr "å?¨å?(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../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:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
 msgstr "æ?¶é?´å??å?²(_T)ï¼?"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
 msgstr "å?¨äº?(_T)"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
 msgstr "å?¨ä¸?(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
-msgstr ""
+msgstr "å?¨æ¯?ä¸ªå?¨å¹´/ç??æ?¥å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "before every appointment"
 msgstr "å?¨æ¯?æ¬¡çº¦ä¼?å??"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+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:25
+#: ../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)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "å°?ä»»å?¡å??è¡¨å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "å°?å¤?å¿?å??è¡¨å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "é¢?è?²(_R)ï¼?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
-msgstr "ä»»å?¡å??è¡¨"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "å¤?å¿?å??è¡¨"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "æ?¥å??å±?æ?§"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "æ?°å»ºæ?¥å??"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "ä»»å?¡å??è¡¨å±?æ?§"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "æ?°å»ºä»»å?¡å??è¡¨"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "å¤?å¿?å??è¡¨å±?æ?§"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "æ?°å»ºå¤?å¿?å??è¡¨"
 
@@ -6069,295 +3641,234 @@ msgstr "%s  æ?¨è¿?æ²¡æ??è¿?è¡?ä¿®æ?¹ï¼?æ?´æ?°ç¼?è¾?å?¨å??ï¼?"
 msgid "Validation error: %s"
 msgstr "æ ¡éª?é??è¯¯ï¼?%s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2391
 msgid " to "
 msgstr " å?° "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2395
 msgid " (Completed "
 msgstr " (å®?æ?? "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2397
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2402
 msgid " (Due "
 msgstr " (é¢?å®? "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2404
 msgid "Due "
 msgstr "é¢?å®? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "é??å? ç??ä¿¡ä»¶ - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
-#: ../composer/e-msg-composer.c:1984
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d å°?é??å? ç??ä¿¡ä»¶"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
-msgid "_Move"
-msgstr "ç§»å?¨(_M)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
-msgid "Cancel _Drag"
-msgstr "å??æ¶?æ??æ?³(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3301 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "é??ä»¶"
+#: ../calendar/gui/dialogs/comp-editor.c:241
+msgid "Could not save attachments"
+msgstr "ä¸?è?½ä¿?å?é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:504
 msgid "Could not update object"
 msgstr "æ? æ³?æ?´æ?°å¯¹è±¡"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:599
 msgid "Edit Appointment"
 msgstr "ç¼?è¾?çº¦ä¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:606
 #, c-format
 msgid "Meeting - %s"
 msgstr "ä¼?è®® - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:608
 #, c-format
 msgid "Appointment - %s"
 msgstr "çº¦ä¼? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:614
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "å??é??ç??ä»»å?¡ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:616
 #, c-format
 msgid "Task - %s"
 msgstr "ä»»å?¡ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Memo - %s"
 msgstr "å¤?å¿? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "No Summary"
 msgstr "æ²¡æ??æ¦?è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:791
 msgid "Keep original item?"
-msgstr ""
+msgstr "ä¿?ç??å??å§?æ?¡ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:995
 msgid "Click here to close the current window"
 msgstr "å??å?»æ¤å¤?å?¯å?³é?å½?å??çª?å?£"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:1002
 msgid "Copy selected text to the clipboard"
 msgstr "å°?é??ä¸æ??å?å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:1009
 msgid "Cut selected text to the clipboard"
 msgstr "å°?é??ä¸æ??å?å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:1016
 msgid "Click here to view help available"
 msgstr "å??å?»æ¤å¤?å?¯æ?¥ç??å?¯ç?¨ç??å¸®å?©"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:1023
 msgid "Paste text from the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1044
 msgid "Click here to save the current window"
 msgstr "å??å?»æ¤å¤?å?¯ä¿?å?å½?å??çª?å?£"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1051
 msgid "Select all text"
 msgstr "é??ä¸æ??æ??æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1058
 msgid "_Classification"
 msgstr "å??ç±»(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1072 ../mail/e-mail-browser.c:104
+#: ../shell/e-shell-window-actions.c:1649
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_File"
 msgstr "æ??ä»¶(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_Help"
 msgstr "å¸®å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Options"
 msgstr "é??é¡¹(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
-#: ../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:1100 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1691
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "é??ä»¶(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Click here to attach a file"
 msgstr "å??å?»æ¤å¤?å?¯ä¾¿é??å? æ??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 msgid "_Categories"
 msgstr "ç±»å?«(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1122
 msgid "Toggles whether to display categories"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç±»å?«"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Time _Zone"
 msgstr "æ?¶å?º(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1130
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºæ?¶å?º"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Pu_blic"
 msgstr "å?¬å¼?(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "Classify as public"
 msgstr "å??ç±»ä¸ºå?¬å¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "_Private"
 msgstr "ç§?äºº(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "Classify as private"
 msgstr "å??ç±»ä¸ºç§?äºº"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "_Confidential"
 msgstr "æ?ºå¯?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Classify as confidential"
 msgstr "å??ç±»ä¸ºæ?ºå¯?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "R_ole Field"
 msgstr "è§?è?²å??(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè§?è?²å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_RSVP"
 msgstr "è¯·å??å¤?(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè¯·å??å¤?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "_Status Field"
 msgstr "ç?¶æ??å??(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1181
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç?¶æ??å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1187
 msgid "_Type Field"
 msgstr "ç±»å??å??(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1189
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºå?ºå¸è??ç±»å??å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1820
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "æ??è¿?æ??æ¡£(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1839
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1690
+#: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1934
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> ä¸ªé??ä»¶"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1966
-msgid "Hide Attachment _Bar"
-msgstr "é??è??é??ä»¶æ ?(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1969
-#: ../calendar/gui/dialogs/comp-editor.c:2272
-msgid "Show Attachment _Bar"
-msgstr "æ?¾ç¤ºé??ä»¶æ ?(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2083
-#: ../calendar/gui/dialogs/event-page.c:1876
-#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
-#: ../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/comp-editor.c:2086
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "æ·»å? é??ä»¶(_A)..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2294
-#: ../mail/em-format-html-display.c:2380
-msgid "Show Attachments"
-msgstr "æ?¾ç¤ºé??ä»¶"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "Press space key to toggle attachment bar"
-msgstr "æ??ç©ºæ ¼é?®å?¯å??æ?¢é??ä»¶æ ?"
+#: ../calendar/gui/dialogs/comp-editor.c:1745
+msgid "Save"
+msgstr "ä¿?å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../calendar/gui/dialogs/comp-editor.c:2488
-#: ../calendar/gui/dialogs/comp-editor.c:3334
+#: ../calendar/gui/dialogs/comp-editor.c:2022
+#: ../calendar/gui/dialogs/comp-editor.c:2071
+#: ../calendar/gui/dialogs/comp-editor.c:2960
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ?´æ?°å?°è¾¾ç??è¯?ï¼?å¯¹æ¤é¡¹ç?®ç??æ?´æ?¹å°?è¢«ä¸¢å¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3363
+#: ../calendar/gui/dialogs/comp-editor.c:2928
+#: ../plugins/prefer-plain/prefer-plain.c:67
+msgid "attachment"
+msgstr "é??ä»¶"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2990
 msgid "Unable to use current version!"
 msgstr "æ? æ³?ä½¿ç?¨å½?å??ç??æ?¬ï¼?"
 
@@ -6373,7 +3884,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)"
 
@@ -6425,280 +3936,285 @@ 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:417
+#: ../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:19
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:18
 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:736
-#: ../calendar/gui/dialogs/event-page.c:2724
+#: ../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:755
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ¤æ? æ³?ç¼?è¾?å?¨é?¨äº?ä»¶ã??"
+
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2695
 msgid "This event has alarms"
 msgstr "æ¤äº?ä»¶æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../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:845
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "ä»£ç??äºº(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "å?ºå¸è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1069
 msgid "Event with no start date"
 msgstr "æ²¡æ??å¼?å§?æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1072
 msgid "Event with no end date"
 msgstr "æ²¡æ??ç»?æ??æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/memo-page.c:657
+#: ../calendar/gui/dialogs/task-page.c:836
 msgid "Start date is wrong"
 msgstr "å¼?å§?æ?¥æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1253
 msgid "End date is wrong"
 msgstr "ç»?æ??æ?¥æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "Start time is wrong"
 msgstr "å¼?å§?æ?¶é?´æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1283
 msgid "End time is wrong"
 msgstr "ç»?æ??æ?¶é?´æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1445
+#: ../calendar/gui/dialogs/memo-page.c:698
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "The organizer selected no longer has an account."
 msgstr "é??ä¸ç??ç»?ç»?è??æ²¡æ??å¸?æ?·äº?ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1451
+#: ../calendar/gui/dialogs/memo-page.c:704
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??ç»?ç»?è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "é??è¦?è?³å°?ä¸?ä¸ªå?ºå¸è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1199
-msgid "_Add "
-msgstr "æ·»å? (_A)"
-
-#: ../calendar/gui/dialogs/event-page.c:2600
+#: ../calendar/gui/dialogs/event-page.c:2568
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2644
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1803
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2612
+#: ../calendar/gui/dialogs/memo-page.c:916
+#: ../calendar/gui/dialogs/task-page.c:1720
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "æ?¨æ£å?¨ä»¥ %s ç??èº«ä»½è¡?å?¨"
 
-#: ../calendar/gui/dialogs/event-page.c:2924
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "çº¦ä¼?ç?? %d å¤©å??"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "çº¦ä¼?ç?? %d å°?æ?¶å??"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "çº¦ä¼?ç?? %d å??é??å??"
 
-#: ../calendar/gui/dialogs/event-page.c:2949
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "è?ªå®?ä¹?"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "1 day before appointment"
 msgstr "çº¦ä¼?ç?? 1 å¤©å??"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 msgid "1 hour before appointment"
 msgstr "çº¦ä¼?ç?? 1 å°?æ?¶å??"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../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:8
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "å?ºå¸è??"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "è?ªå®?ä¹?æ??é??ï¼?"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "äº?ä»¶æ??è¿°"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../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:13
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
 msgstr "æ??é??(_A)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../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
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:363
+msgid "_Location:"
+msgstr "ä½?ç½®(_L)ï¼?"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "æ?¶é?´(_T)ï¼?"
 
-#. 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/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "for"
 msgstr "æ??ç»æ?¶é?´"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
 msgid "until"
 msgstr "ç?´å?°"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>ä¸?ä¼?è??(_E)</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "æ?´æ?¹ç»?ç»?è??(_H)"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "è??ç³»äºº(_N)..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "ç»?ç»?è??ï¼?"
-
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2540
 msgid "Memo"
 msgstr "å¤?å¿?"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../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:354
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ¤æ? æ³?ç¼?è¾?å?¨é?¨å¤?å¿?ã??"
+
+#: ../calendar/gui/dialogs/memo-page.c:877
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "æ? æ³?æ??å¼?â??%sâ??ä¸ç??å¤?å¿?ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1562
-#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1044 ../em-format/em-format-quote.c:224
+#: ../em-format/em-format.c:961 ../mail/em-format-html.c:2235
+#: ../mail/em-format-html.c:2293 ../mail/em-format-html.c:2318
+#: ../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/task-page.c:365
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "ç»?(_G)ï¼?"
 
@@ -6722,37 +4238,37 @@ msgstr "æ?¨å?³å°?ä¿®æ?¹å??ç?°ä»»å?¡ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??å®¹ï¼?"
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "æ?¨å?³å°?ä¿®æ?¹å??ç?°å¤?å¿?ã??æ?¨æ?³è¦?ä¿®æ?¹ä½?å??å®¹ï¼?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "å?ªæ?¯æ?¬æ¬¡"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "æ?¬æ¬¡å??ä»¥å??å??æ¬¡"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "æ?¬æ¬¡å??ä»¥å??å??æ¬¡"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "æ??æ??å??æ¬¡"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../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 ""
+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 "å?¨"
 
@@ -6760,7 +4276,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "first"
 msgstr "ç¬¬ä¸?ä¸ª"
 
@@ -6769,7 +4285,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:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1021
 msgid "second"
 msgstr "ç¬¬äº?"
 
@@ -6777,7 +4293,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:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "third"
 msgstr "ç¬¬ä¸?ä¸ª"
 
@@ -6785,21 +4301,29 @@ 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:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "fourth"
 msgstr "ç¬¬å??ä¸ª"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (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:1036
+msgid "fifth"
+msgstr "ç¬¬äº?ä¸ª"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (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:1046
+#: ../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:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1065
 msgid "Other Date"
 msgstr "å?¶å®?æ?¥æ??"
 
@@ -6807,7 +4331,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:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "1st to 10th"
 msgstr "ä¸?æ?¬"
 
@@ -6815,7 +4339,7 @@ msgstr "ä¸?æ?¬"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "11th to 20th"
 msgstr "ä¸æ?¬"
 
@@ -6823,245 +4347,254 @@ msgstr "ä¸æ?¬"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 msgid "21st to 31st"
 msgstr "ä¸?æ?¬"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../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:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1237
 msgid "on the"
 msgstr "å?¨"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "å¾ªç?¯"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2117
 msgid "Add exception"
 msgstr "æ·»å? ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Could not get a selection to modify."
 msgstr "æ? æ³?è?·å¾?è¦?ä¿®æ?¹ç??é??ä¸é¡¹ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Modify exception"
 msgstr "ä¿®æ?¹ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
 msgid "Could not get a selection to delete."
 msgstr "æ? æ³?è?·å¾?è¦?å? é?¤ç??é??ä¸é¡¹ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../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:3
-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:6
+#: ../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:9
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+#, fuzzy
+msgid "Exceptions"
+msgstr "<b>ä¾?å¤?</b>"
+
+#: ../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)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
 msgid "forever"
 msgstr "æ°¸è¿?"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgid "month(s)"
 msgstr "æ??"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgid "week(s)"
 msgstr "å?¨"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
 msgid "year(s)"
 msgstr "å¹´"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
-msgstr ""
+msgstr "å?¨è¿?ä¸ªäº?ä»¶é??å??é??æ??ç??æ??é??"
+
+#: ../calendar/gui/dialogs/send-comp.c:162
+#, fuzzy
+msgid "Notify new attendees _only"
+msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_I)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../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:482
+#: ../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>"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">ç?¶æ??</span>"
-
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2558 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-model-tasks.c:463
+#: ../calendar/gui/e-cal-model-tasks.c:733
+#: ../calendar/gui/e-calendar-table.c:213
+#: ../calendar/gui/e-calendar-table.c:224
+#: ../calendar/gui/e-calendar-table.c:790 ../calendar/gui/e-itip-control.c:934
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/print.c:2616 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/dialogs/task-details-page.ui.h:3
+#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-calendar-table.c:715 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1081 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "é«?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2555
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:287
+#: ../calendar/gui/e-cal-model-tasks.c:461
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:808
+#: ../calendar/gui/e-calendar-table.c:211
+#: ../calendar/gui/e-calendar-table.c:222
+#: ../calendar/gui/e-calendar-table.c:789 ../calendar/gui/print.c:2613
 msgid "In Progress"
 msgstr "è¿?è¡?ä¸"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/dialogs/task-details-page.ui.h:5
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-calendar-table.c:717 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1079 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "ä½?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+#: ../calendar/gui/dialogs/task-details-page.ui.h:7
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-model.c:1280 ../calendar/gui/e-calendar-table.c:716
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1080
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Normal"
 msgstr "ä¸"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:459
+#: ../calendar/gui/e-cal-model-tasks.c:729
+#: ../calendar/gui/e-calendar-table.c:209
+#: ../calendar/gui/e-calendar-table.c:220
+#: ../calendar/gui/e-calendar-table.c:788 ../calendar/gui/print.c:2610
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "å°?æ?ªå¼?å§?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.ui.h:9
 msgid "P_ercent complete:"
 msgstr "å®?æ??ç?¾å??æ¯?(_E)ï¼?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
 msgid "Stat_us:"
 msgstr "ç?¶æ??(_U)ï¼?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
+#. 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:11
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1590
+#: ../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 "ç?¶æ??"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:12
+#: ../calendar/gui/e-calendar-table.c:718 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Undefined"
 msgstr "æ?ªå®?ä¹?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
 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:14
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Priority:"
 msgstr "ä¼?å??çº§(_P)ï¼?"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
 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:525
+#: ../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 "ä»»å?¡ç»?è??"
 
-#: ../calendar/gui/dialogs/task-page.c:373
-#: ../calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "ä»»å?¡ä¸?è?½è¢«ç¼?è¾?ï¼?å? ä¸ºé??æ?©ç??ä»»å?¡å??è¡¨æ?¯å?ªè¯»ç??"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+#, fuzzy
+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.ui.h:4
 msgid "Organi_zer:"
 msgstr "ç»?ç»?è??(_Z)ï¼?"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:809
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥æ??é??è¯¯"
 
-#: ../calendar/gui/dialogs/task-page.c:1760
+#: ../calendar/gui/dialogs/task-page.c:1677
 #, 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 "æ?¶å?ºï¼?"
 
@@ -7139,80 +4672,84 @@ msgstr "å?¨ %2$s æ?¶ %1$s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ä¸ºæ?ªç?¥è§¦å??ç±»å??"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
-#, c-format
-msgid "Click to open %s"
-msgstr "å??å?»ä»¥æ??å¼? %s"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-preview.c:190 ../filter/e-filter-rule.c:658
 msgid "Untitled"
 msgstr "æ? æ ?é¢?"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
-msgid "Start Date:"
-msgstr "å¼?å§?æ?¥æ??ï¼?"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Description:"
-msgstr "æ??è¿°ï¼?"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
-#: ../calendar/gui/e-cal-component-preview.c:309
-msgid "Web Page:"
-msgstr "ç½?é¡µï¼?"
+#: ../calendar/gui/e-cal-component-preview.c:196
+#, fuzzy
+msgid "Categories:"
+msgstr "ç±»å?«"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:235
+#: ../calendar/gui/e-itip-control.c:1152 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "æ¦?è¦?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-component-preview.c:257
+msgid "Start Date:"
+msgstr "å¼?å§?æ?¥æ??ï¼?"
+
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Due Date:"
 msgstr "å?°æ??æ?¥æ??ï¼?"
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1043
+#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-itip-control.c:1177
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "ç?¶æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:310
 msgid "Priority:"
 msgstr "ä¼?å??çº§ï¼?"
 
+#: ../calendar/gui/e-cal-component-preview.c:335
+#: ../calendar/gui/e-itip-control.c:1215 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
+msgid "Description:"
+msgstr "æ??è¿°ï¼?"
+
+#: ../calendar/gui/e-cal-component-preview.c:366
+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:359
+msgid "Created"
+msgstr "å??å»ºæ?¶é?´"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "ç»?æ??æ?¥æ??"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "ä¸?æ¬¡ä¿®æ?¹"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "å¼?å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:629
+#: ../calendar/gui/e-calendar-table.c:767
 msgid "Free"
 msgstr "ç©ºé?²"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:630
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:768
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "Busy"
 msgstr "ç¹?å¿?"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:681
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7222,234 +4759,166 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-cal-model-tasks.c:1083 ../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:1029 ../calendar/gui/e-cal-model.c:1012
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-cal-model-tasks.c:1083 ../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:791
+#, fuzzy
+msgid "Shell Settings"
+msgstr "Exchange è®¾ç½®"
+
+#: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
+#: ../shell/e-shell.c:792
+#, fuzzy
+msgid "Application-wide settings"
+msgstr "è?ªå?¨è¡¥å?¨è®¾ç½®"
+
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1341
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1198
+#: ../calendar/gui/e-itip-control.c:1337
+#: ../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:975
+#: ../calendar/gui/print.c:992 ../e-util/e-charset.c:52 ../mail/em-utils.c:961
+#: ../plugins/itip-formatter/itip-formatter.c:461
+#: ../plugins/itip-formatter/itip-formatter.c:2325
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "æ?ªç?¥"
 
-#: ../calendar/gui/e-cal-model.c:1008
+#: ../calendar/gui/e-cal-model.c:1282
 msgid "Recurring"
 msgstr "é??å¤?"
 
-#: ../calendar/gui/e-cal-model.c:1010
+#: ../calendar/gui/e-cal-model.c:1284
 msgid "Assigned"
 msgstr "å·²å??é??"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "å?¦å?ä¸º..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
-msgid "Select folder to save selected attachments..."
-msgstr "é??æ?©ä¿?å?é??ä¸é??ä»¶ç??æ??ä»¶å¤¹..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
+#: ../calendar/gui/e-cal-model.c:2179 ../calendar/gui/gnome-cal.c:2035
 #, c-format
-msgid "untitled_image.%s"
-msgstr "æ? æ ?é¢?å?¾å??.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:925
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "å?¦å?ä¸º(_S)..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "è®¾ä¸ºè??æ?¯(_B)"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "ä¿?å?é??ä¸(_S)"
-
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
-#, c-format
-msgid "Open in %s..."
-msgstr "å?¨ %s ä¸æ??å¼?..."
+msgid "Opening %s"
+msgstr "æ??å¼? %s"
 
-#: ../calendar/gui/e-calendar-table.c:337
+#: ../calendar/gui/e-calendar-table.c:328 ../calendar/gui/e-memo-table.c:261
 msgid "* No Summary *"
 msgstr "* æ²¡æ??æ¦?è¦? *"
 
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2399
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-table.c:364
+#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:297
 #, 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:376
-#: ../calendar/gui/e-calendar-view.c:2403
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:300
 #, c-format
 msgid "Organizer: %s"
 msgstr "ç»?ç»?è??ï¼?%s"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:406 ../calendar/gui/e-memo-table.c:339
 msgid "Start: "
 msgstr "å¼?å§?ï¼?"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:424 ../calendar/gui/e-memo-table.c:357
 msgid "Due: "
 msgstr "å?°æ??ï¼?"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:737
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:600
+#: ../calendar/gui/e-calendar-table.c:738
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:601
+#: ../calendar/gui/e-calendar-table.c:739
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:602
+#: ../calendar/gui/e-calendar-table.c:740
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:603
+#: ../calendar/gui/e-calendar-table.c:741
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:604
+#: ../calendar/gui/e-calendar-table.c:742
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:605
+#: ../calendar/gui/e-calendar-table.c:743
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:606
+#: ../calendar/gui/e-calendar-table.c:744
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:607
+#: ../calendar/gui/e-calendar-table.c:745
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:746
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:609
+#: ../calendar/gui/e-calendar-table.c:747
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:889
-#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
+#: ../calendar/gui/e-calendar-table.c:855 ../calendar/gui/print.c:2014
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:432
+#: ../modules/calendar/e-task-shell-view-actions.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:302
+#: ../modules/calendar/e-task-shell-view.c:439
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:566
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "ä»»å?¡"
+
+#: ../calendar/gui/e-calendar-table.c:1097
+#: ../calendar/gui/e-calendar-view.c:602 ../calendar/gui/e-memo-table.c:883
 msgid "Deleting selected objects"
 msgstr "å? é?¤é??ä¸ç??å¯¹è±¡"
 
-#: ../calendar/gui/e-calendar-table.c:1173
-#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:1366
+#: ../calendar/gui/e-calendar-view.c:787 ../calendar/gui/e-memo-table.c:1081
 msgid "Updating objects"
 msgstr "æ?´æ?°å¯¹è±¡"
 
-#: ../calendar/gui/e-calendar-table.c:1361
-#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:819
-#: ../composer/e-composer-actions.c:275
-msgid "Save as..."
-msgstr "å?¦å?ä¸º..."
-
-#: ../calendar/gui/e-calendar-table.c:1585
-#: ../calendar/gui/e-calendar-view.c:1758
-msgid "New _Task"
-msgstr "æ?°å»ºä»»å?¡(_T)"
-
-#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
-msgid "Open _Web Page"
-msgstr "æ??å¼?ç½?é¡µ(_W)"
-
-#: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
-msgid "P_rint..."
-msgstr "æ??å?°(_R)..."
-
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
-#: ../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:1597
-#: ../calendar/gui/e-calendar-view.c:1764
-#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
-#: ../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:1601 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "å??é??ä»»å?¡(_A)"
-
-#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "ä½?ä¸º iCalendar è½¬å??(_F)"
-
-#: ../calendar/gui/e-calendar-table.c:1603
-msgid "_Mark as Complete"
-msgstr "æ ?è®°ä¸ºå®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1604
-msgid "_Mark Selected Tasks as Complete"
-msgstr "æ??ä»»å?¡æ ?è®°ä¸ºå®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1605
-msgid "_Mark as Incomplete"
-msgstr "æ ?è®°ä¸ºæ?ªå®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1606
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "æ??ä»»å?¡æ ?è®°ä¸ºæ?ªå®?æ??(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1611
-msgid "_Delete Selected Tasks"
-msgstr "å? é?¤é??ä¸ä»»å?¡(_D)"
-
-#: ../calendar/gui/e-calendar-table.c:1848
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "å??å?»ä»¥æ·»å? ä»»å?¡"
-
 #: ../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 "å®?æ??"
@@ -7458,167 +4927,85 @@ msgstr "å®?æ??"
 msgid "Completion date"
 msgstr "å®?æ??æ?¥æ??"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "å?°æ??æ?¥æ??"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Priority"
 msgstr "ä¼?å??çº§"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 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:10
-#: ../calendar/gui/e-calendar-view.c:2307
-#: ../calendar/gui/e-meeting-list-view.c:561
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "ç?¶æ??"
-
-#: ../calendar/gui/e-calendar-view.c:1444
-msgid "Moving items"
-msgstr "ç§»å?¨é¡¹ç?®"
-
-#: ../calendar/gui/e-calendar-view.c:1446
-msgid "Copying items"
-msgstr "å¤?å?¶é¡¹ç?®"
-
-#: ../calendar/gui/e-calendar-view.c:1755
-msgid "New _Appointment..."
-msgstr "æ?°å»ºçº¦ä¼?(_A)..."
-
-#: ../calendar/gui/e-calendar-view.c:1756
-msgid "New All Day _Event"
-msgstr "æ?°å»ºå?¨å¤©äº?ä»¶(_E)"
-
-#: ../calendar/gui/e-calendar-view.c:1757
-msgid "New _Meeting"
-msgstr "æ?°å»ºä¼?è®®(_M)"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1768
-msgid "_Current View"
-msgstr "å½?å??è§?å?¾(_C)"
-
-#: ../calendar/gui/e-calendar-view.c:1770
-msgid "Select T_oday"
-msgstr "é??æ?©ä»?å¤©(_O)"
-
-#: ../calendar/gui/e-calendar-view.c:1771
-msgid "_Select Date..."
-msgstr "é??æ?©æ?¥æ??(_S)..."
-
-#: ../calendar/gui/e-calendar-view.c:1777
-msgid "Pri_nt..."
-msgstr "æ??å?°(_N)..."
-
-#: ../calendar/gui/e-calendar-view.c:1787
-msgid "Cop_y to Calendar..."
-msgstr "å¤?å?¶å?°æ?¥å??(_Y)..."
-
-#: ../calendar/gui/e-calendar-view.c:1788
-msgid "Mo_ve to Calendar..."
-msgstr "ç§»è?³æ?¥å??(_V)..."
-
-#: ../calendar/gui/e-calendar-view.c:1789
-msgid "_Delegate Meeting..."
-msgstr "ä»£ç??ä¼?è®®(_D)..."
-
-#: ../calendar/gui/e-calendar-view.c:1790
-msgid "_Schedule Meeting..."
-msgstr "è°?åº¦ä¼?è®®(_S)..."
-
-#: ../calendar/gui/e-calendar-view.c:1791
-msgid "_Forward as iCalendar..."
-msgstr "ä½?ä¸º iCalendar è½¬å??(_F)..."
-
-#: ../calendar/gui/e-calendar-view.c:1792
-msgid "_Reply"
-msgstr "å??å¤?(_R)"
-
-#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Reply to _All"
-msgstr "å??å¤?æ??æ??äºº(_A)"
-
-#: ../calendar/gui/e-calendar-view.c:1798
-msgid "Make this Occurrence _Movable"
-msgstr "å°?æ¤æ¬¡å??ç??å??ä¸ºå?¯ç§»å?¨(_M)"
-
-#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "å? é?¤æ¤æ¬¡å?ºç?°(_O)"
-
-#: ../calendar/gui/e-calendar-view.c:1800
-msgid "Delete _All Occurrences"
-msgstr "å? é?¤æ??æ??å?ºç?°(_A)"
+#: ../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:2254
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-calendar-view.c:1537
+#: ../calendar/gui/e-itip-control.c:1183
+#: ../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:2255
-#: ../calendar/gui/e-itip-control.c:1194
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-calendar-view.c:1538
+#: ../calendar/gui/e-itip-control.c:1193
+#: ../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:2256
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-view.c:1539
+#: ../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:2257
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-calendar-view.c:1540
+#: ../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:2258
+#: ../calendar/gui/e-calendar-view.c:1541
 msgid "Needs action"
 msgstr "é??è¦?å?¨ä½?"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/print.c:2572
 #, c-format
 msgid "Location: %s"
 msgstr "ä½?ç½®ï¼?%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2453
+#: ../calendar/gui/e-calendar-view.c:1733
 #, 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:109
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Yå¹´%mæ??%dæ?¥%A%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d %A %p%I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7631,12 +5018,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:750
+#: ../calendar/gui/e-day-view-time-item.c:760
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i å??é??å??å?²"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:781
 msgid "Show the second time zone"
 msgstr "æ?¾ç¤ºç¬¬äº?æ?¶å?º"
 
@@ -7646,133 +5033,157 @@ 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:851 ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:870 ../calendar/gui/e-day-view.c:1887
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1706
 msgid "%A %d %B"
 msgstr "%B%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.
+#: ../calendar/gui/e-day-view-top-item.c:874 ../calendar/gui/e-day-view.c:1904
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:189
+#: ../modules/calendar/e-cal-shell-view-private.c:910
+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:878 ../calendar/gui/e-day-view.c:1920
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:946
+msgid "%d %b"
+msgstr "%B%-dæ?¥"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/print.c:822
 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:830
+#: ../calendar/gui/e-day-view.c:1126 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/print.c:824
 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:2322
+#: ../calendar/gui/e-day-view.c:2625
 #, c-format
 msgid "Week %d"
 msgstr "ç¬¬%då?¨"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:766
 msgid "Yes. (Complex Recurrence)"
 msgstr "æ?¯(å¤?æ??é??ç?°)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:783
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "æ¯? %d å¤©"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "æ¯? %d å?¨"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:803
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "æ¯? %d å?¨ç??"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:814
 msgid " and "
 msgstr " å?? "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:823
 #, c-format
 msgid "The %s day of "
 msgstr "ç¬¬ %s å¤©å±?äº?"
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:839
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s å±?äº?"
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:850
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "æ¯? %d æ??"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:862
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "æ¯? %d å¹´"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:875
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
 msgstr[0] "æ?»è®¡ %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:880
+#: ../calendar/gui/e-itip-control.c:886
 msgid ", ending on "
 msgstr "ï¼?ç»?æ??äº? "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "å¼?å§?"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:917
 msgid "Ends"
 msgstr "ç»?æ??"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:945
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Due"
 msgstr "å?°æ??"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:988 ../calendar/gui/e-itip-control.c:1049
 msgid "iCalendar Information"
 msgstr "iCalendar ä¿¡æ?¯"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1010
 msgid "iCalendar Error"
 msgstr "iCalendar é??è¯¯"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
-#: ../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:1082 ../calendar/gui/e-itip-control.c:1098
+#: ../calendar/gui/e-itip-control.c:1109 ../calendar/gui/e-itip-control.c:1126
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:526
 msgid "An unknown person"
 msgstr "æ?ªç?¥ç??äºº"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1134
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> è¯·æ?¥ç??ä¸?å??ä¿¡æ?¯ï¼?å¹¶ä»?ä¸?é?¢ç??è??å??ä¸é??æ?©ä¸?ä¸ªå?¨ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:2316
 msgid "Tentatively Accepted"
 msgstr "æ??æ?¶æ?¥å??"
 
@@ -7787,376 +5198,378 @@ msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "ä»»å?¡å·²ç»?è¢«å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??ä»»å?¡å??è¡¨ä¸æ?¾å?°è¯¥ä»»å?¡"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1357
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> å??å¸?äº?ä¼?è®®ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1358
 msgid "Meeting Information"
 msgstr "ä¼?è®®ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1364
 #, 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:1367
+#: ../calendar/gui/e-itip-control.c:1366
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> è¯·æ±?æ?¨å??å? ä¸?ä¸ªä¼?è®®ã??"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1367
 msgid "Meeting Proposal"
 msgstr "ä¼?è®®å»ºè®®"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ã??"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1374
 msgid "Meeting Update"
 msgstr "ä¼?è®®æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??ä¼?è®®ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Update Request"
 msgstr "ä¼?è®®æ?´æ?°è¯·æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> å·²å??å¤?ä¸?ä¸ªä¼?è®®è¯·æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Meeting Reply"
 msgstr "ä¼?è®®ç?å¤?"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> å??æ¶?äº?ä¸?ä¸ªä¼?è®®ã??"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1395
 msgid "Meeting Cancelation"
 msgstr "ä¼?è®®å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1405 ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1522
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> å??é??äº?ä¸?ä¸ªæ? æ³?ç??è§£ç??ä¿¡ä»¶ã??"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Bad Meeting Message"
 msgstr "é??è¯¯ç??ä¼?è®®ä¿¡ä»¶"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1433
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> å??å¸?äº?ä»»å?¡ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1434
 msgid "Task Information"
 msgstr "ä»»å?¡ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1441
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> è¯·æ±? %s å®?æ??ä¸?ä¸ªä»»å?¡ã??"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1443
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> è¯·æ±?æ?¨å®?æ??ä¸?ä¸ªä»»å?¡ã??"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1444
 msgid "Task Proposal"
 msgstr "ä»»å?¡å»ºè®®"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1450
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s<b> å¸?æ??å? å?¥å?°å·²æ??ç??ä»»å?¡ã??"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1451
 msgid "Task Update"
 msgstr "ä»»å?¡æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> å¸?æ??è?·å??æ??æ?°ç??ä»»å?¡ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Update Request"
 msgstr "ä»»å?¡æ?´æ?°è¯·æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1463
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> å·²ç»?å??å¤?äº?ä»»å?¡å??é??ã??"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1464
 msgid "Task Reply"
 msgstr "ä»»å?¡å??å¤?"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1471
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> å??æ¶?äº?ä»»å?¡ã??"
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Task Cancelation"
 msgstr "ä»»å?¡å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1483
 msgid "Bad Task Message"
 msgstr "é??è¯¯ç??ä»»å?¡ä¿¡ä»¶"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1507
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> å??å¸?äº?å¿?é?²ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1508
 msgid "Free/Busy Information"
 msgstr "å¿?é?²ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1512
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> è¯·æ±?æ?¨ç??å¿?é?²ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1513
 msgid "Free/Busy Request"
 msgstr "å¿?/é?²è¯·æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1517
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> åº?ç?äº?å¿?é?²è¯·æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1518
 msgid "Free/Busy Reply"
 msgstr "å¿?é?²åº?ç?"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1523
 msgid "Bad Free/Busy Message"
 msgstr "é??è¯¯ç??å¿?é?²ä¿¡ä»¶"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1599
 msgid "The message does not appear to be properly formed"
 msgstr "ä¿¡ä»¶ç??æ ¼å¼?å?¯è?½ä¸?æ£ç¡®"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1658
 msgid "The message contains only unsupported requests."
 msgstr "ä¿¡ä»¶å?ªå?«æ??ä¸?æ?¯æ??ç??è¯·æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1691
 msgid "The attachment does not contain a valid calendar message"
 msgstr "é??ä»¶ä¸æ²¡æ??æ??æ??ç??æ?¥å??ä¿¡ä»¶"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1729
 msgid "The attachment has no viewable calendar items"
 msgstr "é??ä»¶ä¸æ²¡æ??å?¯æ?¥ç??ç??æ?¥å??é¡¹ç?®"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1971
 msgid "Update complete\n"
 msgstr "æ?´æ?°å®?æ??\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2005
 msgid "Object is invalid and cannot be updated\n"
 msgstr "å¯¹è±¡æ? æ??ï¼?æ? æ³?æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../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:2044
+#: ../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:2068
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "æ?´æ?°å?ºå¸è??ç?¶æ??\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ç?±äº?æ?¡ç?®ä¸?å??å?å?¨è??æ? æ³?æ?´æ?°å?ºå¸è??ç?¶æ??"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../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:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../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:2251
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "é??æ?©ä¸?é¡¹æ´»å?¨ï¼?"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../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 "è¯·å??å¤?"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:332
 msgid "Accept"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "æ??æ?¶æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:346
 msgid "Decline"
 msgstr "æ??ç»?"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "å??é??å¿?é?²ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "æ?´æ?°åº?ç?è??ç?¶æ??"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "å??é??æ??æ?°ç??ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../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:8
+#: ../calendar/gui/e-itip-control.ui.h:7
+msgid "Organizer:"
+msgstr "ç»?ç»?è??ï¼?"
+
+#: ../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:151
-msgid "Attendees"
-msgstr "å?ºå¸è??"
-
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../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:971
 msgid "Individual"
 msgstr "ä¸ªäºº"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../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:972 ../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:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../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:973
 msgid "Resource"
 msgstr "èµ?æº?"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../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:974
 msgid "Room"
 msgstr "æ?¿é?´"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../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:988
 msgid "Chair"
 msgstr "ä¸»å¸"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../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:989
 msgid "Required Participant"
 msgstr "å¿?é??ç??å?ºå¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../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:990
 msgid "Optional Participant"
 msgstr "å?¯é??ç??å?ºå¸è??"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../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:991
 msgid "Non-Participant"
 msgstr "ä¸?å??å? "
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../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:505
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "å?ºå¸è??                            "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2124
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2285
 msgid "%A, %B %d, %Y"
 msgstr "%Yå¹´%mæ??%dæ?¥%A"
 
@@ -8164,78 +5577,78 @@ msgstr "%Yå¹´%mæ??%dæ?¥%A"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2155
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2316
 msgid "%a %m/%d/%Y"
 msgstr "%Yå¹´%mæ??%dæ?¥%A"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Out of Office"
 msgstr "å??å?¬å®¤ä»¥å¤?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "No Information"
 msgstr "æ²¡æ??ä¿¡æ?¯"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "A_ttendees..."
 msgstr "å?ºå¸è??(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:581
 msgid "O_ptions"
 msgstr "é??é¡¹(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:598
 msgid "Show _only working hours"
 msgstr "å?ªæ?¾ç¤ºå·¥ä½?å°?æ?¶(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "æ?¾ç¤ºç¼©æ?¾ç??è¾?å?º(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:623
 msgid "_Update free/busy"
 msgstr "æ?´æ?°å¿?é?²(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "è?ªå?¨è?·å??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:688
 msgid "_All people and resources"
 msgstr "å?¨é?¨äººå??èµ?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:697
 msgid "All _people and one resource"
 msgstr "å?¨é?¨äººå??ä¸?ä¸ªèµ?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "_Required people"
 msgstr "å¿?é??ç??äºº(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:715
 msgid "Required people and _one resource"
 msgstr "å¿?é??ç??äººå??ä¸?ä¸ªèµ?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:761
 msgid "_Start time:"
 msgstr "å¼?å§?æ?¶é?´(_S)ï¼?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:798
 msgid "_End time:"
 msgstr "ç»?æ??æ?¶é?´(_E)ï¼?"
 
@@ -8263,182 +5676,269 @@ msgstr "è¯è¨?"
 msgid "Member"
 msgstr "æ??å??"
 
-#: ../calendar/gui/e-memo-table.c:941
-msgid "_Delete Selected Memos"
-msgstr "å? é?¤é??ä¸å¤?å¿?(_D)"
+#: ../calendar/gui/e-memo-table.c:638
+#: ../modules/calendar/e-cal-shell-content.c:461
+#: ../modules/calendar/e-memo-shell-view-actions.c:254
+#: ../modules/calendar/e-memo-shell-view-actions.c:271
+#: ../modules/calendar/e-memo-shell-view.c:292
+msgid "Memos"
+msgstr "å¤?å¿?"
 
-#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "å??å?»ä»¥æ·»å? å¤?å¿?"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../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:235 ../calendar/gui/print.c:1687
+msgid "%d %B"
+msgstr "%-mæ??%-dæ?¥"
+
+#: ../calendar/gui/ea-cal-view-event.c:263
+msgid "It has alarms."
+msgstr "æ??æ??é??ã??"
+
+#: ../calendar/gui/ea-cal-view-event.c:266
+msgid "It has recurrences."
+msgstr "æ??å??ç?°ã??"
+
+#: ../calendar/gui/ea-cal-view-event.c:269
+msgid "It is a meeting."
+msgstr "ä¸ºä¼?è®®ã??"
+
+#: ../calendar/gui/ea-cal-view-event.c:275
 #, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"%s é??è¯¯ï¼?\n"
-" %s"
+msgid "Calendar Event: Summary is %s."
+msgstr "æ?¥å??äº?ä»¶ï¼?æ??è¦?ä¸º %sã??"
 
-#: ../calendar/gui/e-memos.c:812
-msgid "Loading memos"
-msgstr "è£?å?¥å¤?å¿?"
+#: ../calendar/gui/ea-cal-view-event.c:277
+msgid "Calendar Event: It has no summary."
+msgstr "æ?¥å??äº?ä»¶ï¼?æ? æ??è¦?ã??"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/ea-cal-view-event.c:297
+msgid "calendar view event"
+msgstr "æ?¥å??è§?å?¾äº?ä»¶"
+
+#: ../calendar/gui/ea-cal-view-event.c:525
+msgid "Grab Focus"
+msgstr "è?·å¾?ç?¦ç?¹"
+
+#: ../calendar/gui/ea-cal-view.c:298
+msgid "New Appointment"
+msgstr "æ?°å»ºçº¦ä¼?"
+
+#: ../calendar/gui/ea-cal-view.c:299
+msgid "New All Day Event"
+msgstr "æ?°å»ºå?¨å¤©äº?ä»¶"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Meeting"
+msgstr "æ?°ä¼?è®®"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "Go to Today"
+msgstr "è½¬å?°ä»?å¤©"
+
+#: ../calendar/gui/ea-cal-view.c:302
+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 "å?¯æ?¥ç??å¹¶é??æ?©å½?å??æ?¶é?´è??å?´ç??è¡¨"
+
+#. 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 "Opening memos at %s"
-msgstr "å?¨ %s æ??å¼?å¤?å¿?"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "æ?? %d ä¸ªäº?ä»¶ã??"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
-msgid "Deleting selected objects..."
-msgstr "æ£å?¨å? é?¤é??ä¸ç??å¯¹è±¡..."
+#. 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/e-tasks.c:963
-msgid "Loading tasks"
-msgstr "è£?å?¥ä»»å?¡"
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:158
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "å·¥ä½?æ?¥è§?å?¾ï¼?%sã??%s"
 
-#: ../calendar/gui/e-tasks.c:1061
+#. 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 tasks at %s"
-msgstr "å?¨ %s æ??å¼?ä»»å?¡"
+msgid "Day View: %s. %s"
+msgstr "æ?¥è§?å?¾ï¼?%sã??%s"
 
-#: ../calendar/gui/e-tasks.c:1306
-msgid "Completing tasks..."
-msgstr "æ£å?¨å®?æ??ä»»å?¡..."
+#: ../calendar/gui/ea-day-view.c:195
+msgid "calendar view for a work week"
+msgstr "å·¥ä½?æ?¥ç??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/e-tasks.c:1356
-msgid "Expunging"
-msgstr "é??æ¯?"
+#: ../calendar/gui/ea-day-view.c:197
+msgid "calendar view for one or more days"
+msgstr "ä¸?å¤©æ??å¤?å¤©ç??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/e-timezone-entry.c:127
-msgid "Select Timezone"
-msgstr "é??æ?©æ?¶å?º"
+#: ../calendar/gui/ea-gnome-calendar.c:186
+#: ../modules/calendar/e-cal-shell-view-private.c:906
+msgid "%A %d %b %Y"
+msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
 
-#. 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:343 ../calendar/gui/print.c:1659
-msgid "%d %B"
-msgstr "%-mæ??%-dæ?¥"
+#: ../calendar/gui/ea-gnome-calendar.c:191
+#: ../calendar/gui/ea-gnome-calendar.c:196
+#: ../calendar/gui/ea-gnome-calendar.c:198
+#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+msgid "%a %d %b %Y"
+msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
 
-#: ../calendar/gui/gnome-cal.c:2637
-msgid "_Custom View"
-msgstr "è?ªå®?ä¹?è§?å?¾(_C)"
+#: ../calendar/gui/ea-gnome-calendar.c:215
+#: ../calendar/gui/ea-gnome-calendar.c:221
+#: ../calendar/gui/ea-gnome-calendar.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../modules/calendar/e-cal-shell-view-private.c:939
+#: ../modules/calendar/e-cal-shell-view-private.c:950
+#: ../modules/calendar/e-cal-shell-view-private.c:957
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+msgid "%d %b %Y"
+msgstr "%Yå¹´%-mæ??%-dæ?¥"
 
-#: ../calendar/gui/gnome-cal.c:2638
-msgid "_Save Custom View"
-msgstr "ä¿?å?è?ªå®?ä¹?è§?å?¾(_S)"
+#: ../calendar/gui/ea-gnome-calendar.c:245
+#: ../calendar/gui/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "Gnome æ?¥å??"
 
-#: ../calendar/gui/gnome-cal.c:2643
-msgid "_Define Views..."
-msgstr "å®?ä¹?è§?å?¾(_D)..."
+#: ../calendar/gui/ea-jump-button.c:146
+msgid "Jump button"
+msgstr "è·³è½¬æ??é?®"
 
-#: ../calendar/gui/gnome-cal.c:2880
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "è£?å?¥ä½?äº? %s ç??çº¦ä¼?"
+#: ../calendar/gui/ea-jump-button.c:155
+msgid "Click here, you can find more events."
+msgstr "å??å?»æ¤å¤?å?¯æ?¥æ?¾æ?´å¤?äº?ä»¶ã??"
 
-#: ../calendar/gui/gnome-cal.c:2895
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "è£?å?¥ä½?äº? %s ç??ä»»å?¡"
+msgid "Month View: %s. %s"
+msgstr "æ??è§?å?¾ï¼?%sã??%s"
 
-#: ../calendar/gui/gnome-cal.c:2904
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
-msgid "Loading memos at %s"
-msgstr "è£?å?¥ä½?äº? %s ç??å¤?å¿?"
+msgid "Week View: %s. %s"
+msgstr "å?¨è§?å?¾ï¼?%sã??%s"
+
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "æ??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/gnome-cal.c:3016
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "ä¸?å?¨æ??å¤?å?¨ç??æ?¥å??è§?å?¾"
+
+#: ../calendar/gui/gnome-cal.c:1946
 #, c-format
-msgid "Opening %s"
-msgstr "æ??å¼? %s"
+msgid "Loading appointments at %s"
+msgstr "è£?å?¥ä½?äº? %s ç??çº¦ä¼?"
 
-#: ../calendar/gui/gnome-cal.c:3984
+#: ../calendar/gui/gnome-cal.c:2567
 msgid "Purging"
 msgstr "é??æ¯?"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.ui.h:1
 msgid "April"
 msgstr "å??æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.ui.h:2
 msgid "August"
 msgstr "å?«æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.ui.h:3
 msgid "December"
 msgstr "å??äº?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.ui.h:4
 msgid "February"
 msgstr "äº?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.ui.h:5
 msgid "January"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.ui.h:6
 msgid "July"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.ui.h:7
 msgid "June"
 msgstr "å?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.ui.h:8
 msgid "March"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.ui.h:9
 msgid "May"
 msgstr "äº?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.ui.h:10
 msgid "November"
 msgstr "å??ä¸?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.ui.h:11
 msgid "October"
 msgstr "å??æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "é??æ?©æ?¥æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:13
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "é??æ?©ä»?å¤©(_S)"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../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:448
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?ä¸ªå??å? è??"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:780
 msgid "Event information"
 msgstr "äº?ä»¶ä¿¡æ?¯"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:775
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
 msgid "Task information"
 msgstr "ä»»å?¡ä¿¡æ?¯"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:786
 msgid "Memo information"
 msgstr "å¤?å¿?ä¿¡æ?¯"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
 msgid "Free/Busy information"
 msgstr "å¿?é?²ä¿¡æ?¯"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:642
 msgid "Calendar information"
 msgstr "æ?¥å??ä¿¡æ?¯"
 
@@ -8446,7 +5946,7 @@ msgstr "æ?¥å??ä¿¡æ?¯"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:668
+#: ../calendar/gui/itip-utils.c:676
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "æ?¥å??"
@@ -8455,7 +5955,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:675
+#: ../calendar/gui/itip-utils.c:683
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ??æ?¶æ?¥å??"
@@ -8467,7 +5967,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:682 ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:738
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "æ??ç»?"
@@ -8476,7 +5976,7 @@ msgstr "æ??ç»?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:689
+#: ../calendar/gui/itip-utils.c:697
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "è¢«å§?ä»»ç??"
@@ -8484,7 +5984,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:702
+#: ../calendar/gui/itip-utils.c:710
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "æ?´æ?°"
@@ -8492,7 +5992,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:709
+#: ../calendar/gui/itip-utils.c:717
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -8500,7 +6000,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:716
+#: ../calendar/gui/itip-utils.c:724
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "å?·æ?°"
@@ -8508,426 +6008,230 @@ 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:723
+#: ../calendar/gui/itip-utils.c:731
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??ç¥¨è¡¨å?³"
 
-#: ../calendar/gui/itip-utils.c:793
+#: ../calendar/gui/itip-utils.c:801
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "å¿?é?²ä¿¡æ?¯ (%s å?° %s)"
 
-#: ../calendar/gui/itip-utils.c:801
+#: ../calendar/gui/itip-utils.c:809
 msgid "iCalendar information"
 msgstr "iCalendar ä¿¡æ?¯"
 
-#: ../calendar/gui/itip-utils.c:972
-msgid "You must be an attendee of the event."
-msgstr "æ?¨å¿?é¡»æ?¯äº?ä»¶ç??å?ºå¸è??ã??"
-
-#: ../calendar/gui/memos-component.c:499
-msgid "_New Memo List"
-msgstr "æ?°å»ºå¤?å¿?å??è¡¨(_N)"
-
-#: ../calendar/gui/memos-component.c:582
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d ä¸ªå¤?å¿?"
-
-#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] "ï¼?å·²é??ä¸ %d ä¸ª"
-
-#: ../calendar/gui/memos-component.c:631
-msgid "Failed upgrading memos."
-msgstr "å??çº§å¤?å¿?å¤±è´¥ã??"
-
-#: ../calendar/gui/memos-component.c:873
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "æ? æ³?æ??å¼?å¤?å¿?å??è¡¨â??%sâ??æ?¥å??å»ºäº?ä»¶å??ä¼?è®®"
-
-#: ../calendar/gui/memos-component.c:886
-msgid "There is no calendar available for creating memos"
-msgstr "æ²¡æ??å?¯å??å»ºå¤?å¿?ç??æ?¥å??"
-
-#: ../calendar/gui/memos-component.c:996
-msgid "Memo Source Selector"
-msgstr "å¤?å¿?æ?¥æº?é??æ?©å?¨"
-
-#: ../calendar/gui/memos-component.c:1175
-msgid "New memo"
-msgstr "æ?°å»ºå¤?å¿?"
-
-#: ../calendar/gui/memos-component.c:1176
-msgctxt "New"
-msgid "Mem_o"
-msgstr "å¤?å¿?(_O)"
-
-#: ../calendar/gui/memos-component.c:1177
-msgid "Create a new memo"
-msgstr "å??å»ºæ?°å¤?å¿?"
-
-#: ../calendar/gui/memos-component.c:1183
-msgid "New shared memo"
-msgstr "æ?°å»ºå?±äº«å¤?å¿?"
-
-#: ../calendar/gui/memos-component.c:1184
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "å?±äº«å¤?å¿?(_S)"
-
-#: ../calendar/gui/memos-component.c:1185
-msgid "Create a shared new memo"
-msgstr "å??å»ºæ?°ç??å?±äº«å¤?å¿?"
-
-#: ../calendar/gui/memos-component.c:1191
-msgid "New memo list"
-msgstr "æ?°å»ºå¤?å¿?å??è¡¨"
-
-#: ../calendar/gui/memos-component.c:1192
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "å¤?å¿?å??è¡¨(_S)"
-
-#: ../calendar/gui/memos-component.c:1193
-msgid "Create a new memo list"
-msgstr "å??å»ºæ?°å¤?å¿?å??è¡¨"
-
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
-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:829
+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..."
+#: ../calendar/gui/itip-utils.c:831
+msgid "Unable to book a resource, error: "
 msgstr ""
-"Evolution æ?¥å??æ??ä»¶å¤¹ç??ä½?ç½®å??å±?æ¬¡ä¸? Evolution 1.x ä¸?å??ã??\n"
-"\n"
-"è¯·ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??ä»¶å¤¹..."
-
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "æ? æ³?ä»? evolution/config.xmldb ä¸å??è¿?æ?§è®¾ç½®"
 
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "æ? æ³?å??è¿?æ?¥å??â??%sâ??"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "æ? æ³?å??è¿?ä»»å?¡â??%sâ??"
-
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "ç¬?è®°"
+#: ../calendar/gui/itip-utils.c:985
+msgid "You must be an attendee of the event."
+msgstr "æ?¨å¿?é¡»æ?¯äº?ä»¶ç??å?ºå¸è??ã??"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "31æ?¥"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:590
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:590
 msgid "Mo"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:590
 msgid "Tu"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:590
 msgid "We"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:591
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:591
 msgid "Fr"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:591
 msgid "Sa"
 msgstr "å?"
 
-#: ../calendar/gui/print.c:2478
+#: ../calendar/gui/print.c:2536
 msgid "Appointment"
 msgstr "çº¦ä¼?"
 
-#: ../calendar/gui/print.c:2480
+#: ../calendar/gui/print.c:2538
 msgid "Task"
 msgstr "ä»»å?¡"
 
-#: ../calendar/gui/print.c:2505
+#: ../calendar/gui/print.c:2563
 #, c-format
 msgid "Summary: %s"
 msgstr "æ¦?è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2528
+#: ../calendar/gui/print.c:2586
 msgid "Attendees: "
 msgstr "å?ºå¸è??ï¼?"
 
-#: ../calendar/gui/print.c:2568
+#: ../calendar/gui/print.c:2626
 #, c-format
 msgid "Status: %s"
 msgstr "ç?¶æ??ï¼?%s"
 
-#: ../calendar/gui/print.c:2585
+#: ../calendar/gui/print.c:2640
 #, c-format
 msgid "Priority: %s"
 msgstr "ä¼?å??çº§ï¼?%s"
 
-#: ../calendar/gui/print.c:2597
+#: ../calendar/gui/print.c:2655
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç??ï¼?%i"
 
-#: ../calendar/gui/print.c:2609
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "URL: %s"
 msgstr "URLï¼?%s"
 
-#: ../calendar/gui/print.c:2622
+#: ../calendar/gui/print.c:2679
 #, c-format
 msgid "Categories: %s"
 msgstr "ç±»å?«ï¼?%s"
 
-#: ../calendar/gui/print.c:2633
+#: ../calendar/gui/print.c:2690
 msgid "Contacts: "
 msgstr "è??ç³»äººï¼?"
 
-#: ../calendar/gui/tasks-component.c:490
-msgid "_New Task List"
-msgstr "æ?°å»ºä»»å?¡å??è¡¨(_N)"
-
-#: ../calendar/gui/tasks-component.c:573
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d ä¸ªä»»å?¡"
-
-#: ../calendar/gui/tasks-component.c:622
-msgid "Failed upgrading tasks."
-msgstr "å??çº§ä»»å?¡å¤±è´¥ã??"
-
-#: ../calendar/gui/tasks-component.c:861
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "æ? æ³?æ??å¼?ä»»å?¡å??è¡¨â??%sâ??æ?¥å??å»ºäº?ä»¶å??ä¼?è®®"
-
-#: ../calendar/gui/tasks-component.c:874
-msgid "There is no calendar available for creating tasks"
-msgstr "æ²¡æ??å?¯å??å»ºä»»å?¡ç??æ?¥å??"
-
-#: ../calendar/gui/tasks-component.c:985
-msgid "Task Source Selector"
-msgstr "ä»»å?¡æ?¥æº?é??æ?©å?¨"
-
-#: ../calendar/gui/tasks-component.c:1239
-msgid "New task"
-msgstr "æ?°å»ºä»»å?¡"
-
-#: ../calendar/gui/tasks-component.c:1241
-msgid "Create a new task"
-msgstr "å??å»ºæ?°ä»»å?¡"
-
-#: ../calendar/gui/tasks-component.c:1247
-msgid "New assigned task"
-msgstr "æ?°å»ºå??é??ç??ä»»å?¡"
-
-#: ../calendar/gui/tasks-component.c:1248
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "å??é??ç??ä»»å?¡(_D)"
-
-#: ../calendar/gui/tasks-component.c:1249
-msgid "Create a new assigned task"
-msgstr "å??å»ºæ?°å??é??ç??ä»»å?¡"
-
-#: ../calendar/gui/tasks-component.c:1255
-msgid "New task list"
-msgstr "æ?°å»ºä»»å?¡å??è¡¨"
-
-#: ../calendar/gui/tasks-component.c:1256
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "ä»»å?¡å??è¡¨(_K)"
-
-#: ../calendar/gui/tasks-component.c:1257
-msgid "Create a new task list"
-msgstr "å??å»ºæ?°ä»»å?¡å??è¡¨"
-
-#: ../calendar/gui/tasks-control.c:442
-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:445 ../mail/em-folder-view.c:1123
-msgid "Do not ask me again."
-msgstr "ä¸?è¦?å??æ¬¡è¯¢é?®ã??"
-
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
-msgid "Print Tasks"
-msgstr "æ??å?°ä»»å?¡"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -8941,11 +6245,11 @@ msgstr "å·²å??æ¶?"
 msgid "In progress"
 msgstr "è¿?è¡?ä¸"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../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:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "å°?äº?"
 
@@ -8953,29 +6257,29 @@ msgstr "å°?äº?"
 msgid "Appointments and Meetings"
 msgstr "çº¦ä¼?å??ä¼?è®®"
 
-#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../plugins/itip-formatter/itip-formatter.c:1821
 msgid "Opening calendar"
 msgstr "æ??å¼?æ?¥å??"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar æ??ä»¶(.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar å¯¼å?¥å?¨"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "æ??é??!!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar æ??ä»¶(.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar å¯¼å?¥å?¨"
 
@@ -9536,7 +6840,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 "ç¾?æ´²/çº½çº¦"
 
@@ -10536,301 +7840,267 @@ msgstr "å¤ªå¹³æ´?/æ²?å?©æ?¯"
 msgid "Pacific/Yap"
 msgstr "å¤ªå¹³æ´?/é??æµ¦"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "æ? æ³?æ??å¼?è?ªå?¨ä¿?å?æ??ä»¶"
-
-#: ../composer/e-composer-autosave.c:280
-msgid "Unable to retrieve message from editor"
-msgstr "æ? æ³?ä»?ç¼?è¾?å?¨è?·å??ä¿¡ä»¶"
-
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "æ??å?¥é??ä»¶"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "é??ä»¶(_T)"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:79
 msgid "Untitled Message"
 msgstr "æ? æ ?é¢?ä¿¡ä»¶"
 
-#: ../composer/e-composer-actions.c:471
+#: ../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:476 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:286
+#: ../widgets/misc/e-signature-editor.c:200
 msgid "_Close"
 msgstr "å?³é?(_C)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:288
 msgid "Close the current file"
 msgstr "å?³é?å½?å??æ??ä»¶"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../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:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
-#: ../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:499
+#: ../composer/e-composer-actions.c:309
 msgid "Save the current file"
 msgstr "ä¿?å?å½?å??æ??ä»¶"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:314
 msgid "Save _As..."
 msgstr "å?¦å?ä¸º(_A)..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:316
 msgid "Save the current file with a different name"
 msgstr "ç?¨ä¸?å??ç??æ??ä»¶å??ä¿?å?å½?å??æ??ä»¶"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:321
 msgid "Save as _Draft"
 msgstr "å?¦å?ä¸ºè??ç¨¿(_D)"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:323
 msgid "Save as draft"
 msgstr "å?¦å?ä¸ºè??ç¨¿"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:202
 msgid "S_end"
 msgstr "å??é??(_E)"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:330
 msgid "Send this message"
 msgstr "å??é??è¿?å°?ä¿¡"
 
-#: ../composer/e-composer-actions.c:527
-msgid "Insert Send options"
-msgstr "æ??å?¥å??é??é??é¡¹"
-
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:335
 msgid "New _Message"
 msgstr "æ?°å»ºä¿¡ä»¶(_M)"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:337
 msgid "Open New Message window"
 msgstr "æ??å¼?æ?°å»ºä¿¡ä»¶çª?å?£"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:344
 msgid "Character _Encoding"
 msgstr "å?ç¬¦ç¼?ç ?(_E)"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:351
 msgid "_Security"
 msgstr "å®?å?¨(_S)"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PGP å? å¯?(_E)"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "ç?¨ PGP å? å¯?è¯¥ä¿¡ä»¶"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "PGP ç¾å??(_S)"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨æ?¨ç?? PGP å¯?é?¥ç¾å??è¯¥ä¿¡ä»¶"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:377
 msgid "_Prioritize Message"
 msgstr "æ ?ä¸ºä¼?å??(_P)"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:379
 msgid "Set the message priority to high"
 msgstr "å°?ä¿¡ä»¶è®¾å®?ä¸ºé«?ä¼?å??çº§"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:385
 msgid "Re_quest Read Receipt"
 msgstr "è¯·æ±?é??è¯»æ?¶æ?¡(_Q)"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:387
 msgid "Get delivery notification when your message is read"
 msgstr "å½?æ?¨ç??ä¿¡ä»¶è¢«é??è¯»æ?¶å¾?å?°æ??é??é??ç?¥"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:393
 msgid "S/MIME En_crypt"
 msgstr "S/MIME å? å¯?(_C)"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME å? å¯?è¯?ä¹¦å? å¯?è¯¥ä¿¡ä»¶"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ç¾å??(_N)"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME ç¾å??è®¤è¯?ç¾å??è¯¥ä¿¡ä»¶"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
 msgstr "æ??é??å??(_B)"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºæ??ä¸è½¬å??å??"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
 msgstr "æ??é??å??(_C)"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºè½¬å??å??"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:425
 msgid "_From Field"
 msgstr "å??ä»¶äººå??(_F)"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºå??ä»¶äººé??æ?©å?¨"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "æ??é??å?°å??(_P)"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "æ?¯å?¦æ?¾ç¤ºæ??é??å?°å??"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "å??å¤?å??(_R)"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºå??å¤?å??"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "ä¸»é¢?å??(_C)"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºä¸»é¢?å??"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "æ?¶ä»¶äººå??(_T)"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "æ?¯å?¦æ?¾ç¤ºå¯?ç»?å??"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:478
 msgid "Save Draft"
 msgstr "ä¿?å?è??ç¨¿"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "è¾?å?¥ä¿¡ä»¶ç??æ?¶ä»¶äºº"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡ä»¶å?¯æ?¬ç??æ?¶ä»¶äººå?°å??"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../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:643
+#: ../composer/e-composer-header-table.c:949
 msgid "Fr_om:"
 msgstr "å??ä»¶äºº(_O)ï¼?"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:949
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
+#: ../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:958
 msgid "_Reply-To:"
 msgstr "å??å¤?å?°(_R)ï¼?"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:963
 msgid "_To:"
 msgstr "æ?¶ä¿¡äºº(_T)ï¼?"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:969
 msgid "_Cc:"
 msgstr "æ??é??(_C)ï¼?"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:969
+#, fuzzy
+msgid "Show CC"
+msgstr "æ?¾ç¤º(_W)ï¼?"
+
+#: ../composer/e-composer-header-table.c:975
 msgid "_Bcc:"
 msgstr "æ??é??(_B)ï¼?"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:975
+#, fuzzy
+msgid "Show BCC"
+msgstr "æ?¾ç¤º(_W)ï¼?"
+
+#: ../composer/e-composer-header-table.c:980
 msgid "_Post To:"
 msgstr "æ??é??å?°(_P)ï¼?"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:984
 msgid "S_ubject:"
 msgstr "ä¸»é¢?(_U)ï¼?"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:993
 msgid "Si_gnature:"
 msgstr "ç¾å??(_G)ï¼?"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../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:179 ../composer/e-msg-composer.c:1552
-msgid "Show _Attachment Bar"
-msgstr "æ?¾ç¤ºé??ä»¶æ ?(_A)"
+#: ../composer/e-composer-private.c:218
+#, fuzzy
+msgid "Save draft"
+msgstr "ä¿?å?è??ç¨¿"
+
+#. Check buttons
+#: ../composer/e-msg-composer.c:193 ../mail/em-utils.c:180
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "ä¸?å??æ?¾ç¤ºæ¤ä¿¡æ?¯(_D)ã??"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:989
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "æ? æ³?å¯¹å¯?å?ºç??ä¿¡ä»¶ç¾å??ï¼?æ?ªå¯¹æ¤è´¦æ?·è®¾ç½®ç¾å??è¯?ä¹¦"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:996
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "æ? æ³?å¯¹å¯?å?ºç??ä¿¡ä»¶å? å¯?ï¼?æ?ªå¯¹æ¤è´¦æ?·è®¾ç½®å? å¯?è¯?ä¹¦"
 
-#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
-#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "é??ä»¶"
-
-#: ../composer/e-msg-composer.c:1550
-msgid "Hide _Attachment Bar"
-msgstr "é??è??é??ä»¶æ ?(_A)"
+#: ../composer/e-msg-composer.c:1385
+#, fuzzy
+msgid "Unable to reconstruct message from autosave file"
+msgstr "æ? æ³?ä»?ç¼?è¾?å?¨è?·å??ä¿¡ä»¶"
 
-#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
+#: ../composer/e-msg-composer.c:1451 ../composer/e-msg-composer.c:2178
 msgid "Compose Message"
 msgstr "æ?°å??æ?°ä¿¡ä»¶"
 
-#: ../composer/e-msg-composer.c:4093
+#: ../composer/e-msg-composer.c:3408
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10912,20 +8182,10 @@ msgid ""
 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
 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
+#: ../composer/mail-composer.error.xml.h:18
 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."
@@ -10933,7 +8193,7 @@ msgstr ""
 "è¦?å°?æ¤ç?®å½?ç??å??å®¹ä½?ä¸ºé??ä»¶ï¼?æ?¨é??è¦?é??ä¸?æ·»å? æ¤ç?®å½?ä¸ç??æ??ä»¶ï¼?æ??è??å??å»ºä¸?ä¸ªæ¤ç?®å½?ç??"
 "å½?æ¡£æ??ä»¶ï¼?ç?¶å??å°?æ¤å½?æ¡£ä½?ä¸ºé??ä»¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -10943,51 +8203,66 @@ msgstr ""
 "æ? æ³?æ¿?æ´» HTML ç¼?è¾?å?¨ç»?ä»¶ã??\n"
 "è¯·ç¡®å®?æ?¨ç?? gtkhtml å?? libgtkhtml æ??å®?è£?ç??ç??æ?¬æ£ç¡®ã??"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Unable to activate the address selector control."
 msgstr "æ? æ³?æ¿?æ´»å?°å??é??æ?©æ?§å?¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
 msgstr "æ?¾å?°äº?æ?ªå®?æ??ç??ä¿¡ä»¶"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Warning: Modified Message"
 msgstr "è¦å??ï¼?å·²ä¿®æ?¹ç??ä¿¡ä»¶"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
 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:26
 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:27
 msgid "_Continue Editing"
 msgstr "ç»§ç»ç¼?è¾?(_C)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Do not Recover"
 msgstr "ä¸?æ?¢å¤?(_D)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Recover"
 msgstr "æ?¢å¤?(_R)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save Draft"
 msgstr "ä¿?å?è??ç¨¿(_S)"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#, fuzzy
+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:715
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/e-shell-window-private.c:209
+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:951
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Groupwise å¥?ä»¶"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "é??ç½®æ?¨ç??ç?µå?é?®ä»¶ï¼?è??ç³»äººå??æ?¥ç¨?è¡¨"
 
@@ -10999,101 +8274,231 @@ msgstr "å?°å??å?¡"
 msgid "calendar information"
 msgstr "æ?¥å??ä¿¡æ?¯"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
-msgid "Evolution Error"
-msgstr "Evolution é??è¯¯"
+#. 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-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-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
-msgid "Evolution Warning"
-msgstr "Evolution è¦å??"
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "å¸?ä¼¯æ?¥è¯"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "æ?¥æ??"
 
-#: ../e-util/e-error.c:118
-msgid "Evolution Information"
-msgstr "Evolution ä¿¡æ?¯"
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "é?©è¯"
 
-#: ../e-util/e-error.c:120
-msgid "Evolution Query"
-msgstr "Evolution æ?¥è¯¢"
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "æ³°è¯"
 
-#. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "å??è?³å?¶è¯"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1763
+#: ../plugins/itip-formatter/itip-view.c:194
+#: ../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:222
+msgid "Tomorrow"
+msgstr "æ??å¤©"
+
+#: ../e-util/e-datetime-format.c:204
+msgid "Yesterday"
+msgstr "æ?¨å¤©"
+
+#: ../e-util/e-datetime-format.c:207
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "å??é?¨é??è¯¯ï¼?è¯·æ±?äº?æ?ªç?¥ç??é??è¯¯â??%sâ??"
+msgid "%d days from now"
+msgstr "è·?ç?°å?¨æ?? %d å¤©"
+
+#: ../e-util/e-datetime-format.c:209
+#, c-format
+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:302
+msgid "Use locale default"
+msgstr "ä½¿ç?¨æ?¬å?°é»?è®¤å?¼"
+
+#: ../e-util/e-datetime-format.c:496
+msgid "Format:"
+msgstr "æ ¼å¼?ï¼?"
+
+#: ../e-util/e-file-utils.c:135
+#, fuzzy
+msgid "(Unknown Filename)"
+msgstr "æ?ªç?¥ç±»å??"
+
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:139
+#, fuzzy, c-format
+msgid "Writing \"%s\""
+msgstr "æ?¥éª? %s"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "ç»?ä»¶"
+#. 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:144
+#, fuzzy, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "æ??â??%sâ??å¤?å?¶å?° %s"
 
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
+#: ../e-util/e-logger.c:172
+#, fuzzy
+msgid "Name of the logger"
 msgstr "è®°å½?æ?¥å¿?ç??ç»?ä»¶å??ç§°"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-module.c:188
+msgid "Filename"
+msgstr "æ??ä»¶å??"
+
+#: ../e-util/e-module.c:189
+#, fuzzy
+msgid "The filename of the module"
+msgstr "æ?´æ?¹æ¤æ??ä»¶å¤¹ç??å??ç§°"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "è°?è¯?æ?¥å¿?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 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:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "ç§?ã??"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "æ?¥å¿?æ¶?æ?¯ï¼?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "æ?¥å¿?çº§å?«"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
-msgid "Time"
-msgstr "æ?¶é?´"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2627
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ä¿¡ä»¶"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Close this window"
 msgstr "å?³é?æ¤çª?å?£"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "é??è¯¯"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "é??è¯¯"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "è¦å??å??é??è¯¯"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "è°?è¯?"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../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:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../e-util/e-plugin.c:292 ../modules/mail/em-composer-prefs.c:473
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:716
+#: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "å·²å?¯ç?¨"
 
-#: ../e-util/e-plugin.c:309
+#: ../e-util/e-plugin.c:293
 msgid "Whether the plugin is enabled"
 msgstr "æ??ä»¶æ?¯å?¦å·²å?¯ç?¨"
 
@@ -11110,7 +8515,11 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "æ??å?°ç³»ç»?æ?ªæ?¥å??å?³äº?é??è¯¯ç??ä»»ä½?é¢?å¤?ç»?è??ã??"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-signature.c:695
+msgid "Autogenerated"
+msgstr "è?ªå?¨ç??æ??ç??"
+
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "å??å? æ?¯â??{1}â??ã??"
 
@@ -11138,233 +8547,286 @@ msgstr "è¦?ç??æ??ä»¶å??ï¼?"
 msgid "_Overwrite"
 msgstr "è¦?ç??(_O)"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:140
 msgid "Could not open the link."
 msgstr "æ? æ³?æ??å¼?é?¾æ?¥ã??"
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:190
 msgid "Could not display help for Evolution."
 msgstr "æ? æ³?æ?¾ç¤º Evolution ç??å¸®å?©ã??"
 
-#: ../e-util/e-util-labels.c:39
-msgid "I_mportant"
-msgstr "é??è¦?(_M)"
+#: ../e-util/gconf-bridge.c:1222
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf é??è¯¯ï¼?%s"
 
-#. red
-#: ../e-util/e-util-labels.c:40
-msgid "_Work"
-msgstr "å·¥ä½?(_W)"
+#: ../e-util/gconf-bridge.c:1233
+msgid "All further errors shown only on terminal."
+msgstr "å??ç»æ??æ??ç??é??è¯¯é?½å?ªæ?¾ç¤ºå?¨ç»?ç«¯ã??"
 
-#. orange
-#: ../e-util/e-util-labels.c:41
-msgid "_Personal"
-msgstr "ä¸ªäºº(_P)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:960
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "å??å¤?è?³"
 
-#. green
-#: ../e-util/e-util-labels.c:42
-msgid "_To Do"
-msgstr "å¾?å??(_T)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2236 ../mail/em-format-html.c:2300
+#: ../mail/em-format-html.c:2321 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "æ??é??"
 
-#. blue
-#: ../e-util/e-util-labels.c:43
-msgid "_Later"
-msgstr "ç¨?å??(_L)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:963
+#: ../mail/em-format-html.c:2237 ../mail/em-format-html.c:2306
+#: ../mail/em-format-html.c:2324 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "å¯?ä»¶æ??é??"
 
-#: ../e-util/e-util-labels.c:315
-msgid "Label _Name:"
-msgstr "æ ?ç¾å??ç§°(_N)ï¼?"
+#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:964
+#: ../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:1112
+msgid "Subject"
+msgstr "ä¸»é¢?"
 
-#: ../e-util/e-util-labels.c:338
-msgid "Edit Label"
-msgstr "ç¼?è¾?æ ?ç¾"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2416
+#: ../modules/mail/em-mailer-prefs.c:1131
+msgid "Mailer"
+msgstr "é?®ä»¶ç¨?åº?"
 
-#: ../e-util/e-util-labels.c:338
-msgid "Add Label"
-msgstr "æ·»å? æ ?ç¾"
+#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1229
+msgid "-------- Forwarded Message --------"
+msgstr "-------- è½¬å??ç??ä¿¡ä»¶ --------"
 
-#: ../e-util/e-util-labels.c:357
-msgid "Label name cannot be empty."
-msgstr "æ ?ç¾å??ç§°ä¸?è?½ä¸ºç©ºã??"
+#: ../em-format/em-format.c:965 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:566
+msgid "Date"
+msgstr "æ?¥æ??"
 
-#: ../e-util/e-util-labels.c:362
-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:84
+msgid "Newsgroups"
+msgstr "æ?°é?»ç»?"
+
+#: ../em-format/em-format.c:967 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "å¤´å??"
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../em-format/em-format.c:1320
 #, c-format
-msgid "GConf error: %s"
-msgstr "GConf é??è¯¯ï¼?%s"
+msgid "%s attachment"
+msgstr "%s é??ä»¶"
 
-#: ../e-util/gconf-bridge.c:1231
-msgid "All further errors shown only on terminal."
-msgstr "å??ç»æ??æ??ç??é??è¯¯é?½å?ªæ?¾ç¤ºå?¨ç»?ç«¯ã??"
+#: ../em-format/em-format.c:1375
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "æ? æ³?è§£æ?? S/MIME ä¿¡ä»¶ï¼?æ?ªç?¥é??è¯¯"
+
+#: ../em-format/em-format.c:1513 ../em-format/em-format.c:1675
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "æ? æ³?è§£æ?? MIME ä¿¡ä»¶ã??æ?¾ç¤ºæº?æ??æ?¬ã??"
+
+#: ../em-format/em-format.c:1521
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "ä¸?æ?¯æ?? multipart/encrypted ç??å? å¯?ç±»å??"
 
-#: ../filter/filter-datespec.c:81
+#: ../em-format/em-format.c:1533
+msgid "Could not parse PGP/MIME message"
+msgstr "æ? æ³?è§£æ?? PGP/MIME ä¿¡ä»¶"
+
+#: ../em-format/em-format.c:1533
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "æ? æ³?è§£æ?? PGP/MIME ä¿¡ä»¶ï¼?æ?ªç?¥é??è¯¯"
+
+#: ../em-format/em-format.c:1699
+msgid "Unsupported signature format"
+msgstr "ä¸?æ?¯æ??ç??ç¾å??æ ¼å¼?"
+
+#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1848
+msgid "Error verifying signature"
+msgstr "æ ¡éª?ç¾å??é??è¯¯"
+
+#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1837
+#: ../em-format/em-format.c:1848
+msgid "Unknown error verifying signature"
+msgstr "æ ¡éª?ç¾å??å??ç??äº?æ?ªç?¥é??è¯¯"
+
+#: ../em-format/em-format.c:1925
+msgid "Could not parse PGP message"
+msgstr "æ? æ³?å??æ?? PGP ä¿¡ä»¶"
+
+#: ../em-format/em-format.c:1925
+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] "%d ç§?å??"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d ç§?å??"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d å??é??å??"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d å??é??å??"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d å°?æ?¶å??"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d å°?æ?¶å??"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d å¤©å??"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d å??"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d å?¨å??"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d å?¨å??"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ä¸ªæ??å??"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d ä¸ªæ??å??"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d å¹´å??"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d å¹´å??"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<å??å?»æ¤å¤?ä»¥é??æ?©æ?¥æ??>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../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:298
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "é??æ?©ç?¨äº?æ¯?è¾?ç??æ?¶é?´"
 
-#: ../filter/filter-file.c:284
-msgid "Choose a file"
+#: ../filter/e-filter-file.c:184
+#, fuzzy
+msgid "Choose a File"
 msgstr "é??æ?©æ??ä»¶"
 
-#: ../filter/filter-part.c:532
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "æµ?è¯?"
-
-#: ../filter/filter-rule.c:853
+#: ../filter/e-filter-rule.c:653
 msgid "R_ule name:"
 msgstr "è§?å??å??(_U)ï¼?"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/e-filter-rule.c:682
 msgid "Find items that meet the following conditions"
 msgstr "æ?¥æ?¾ç¬¦å??ä¸?å??æ?¡ä»¶ç??é¡¹ç?®"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/e-filter-rule.c:716
 msgid "A_dd Condition"
 msgstr "æ·»å? å?¨ä½?(_D)"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/e-filter-rule.c:722
 msgid "If all conditions are met"
 msgstr "å¦?æ??æ»¡è¶³æ??æ??æ?¡ä»¶"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "å¦?æ??æ»¡è¶³ä»»ä¸?æ?¡ä»¶"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/e-filter-rule.c:724
 msgid "_Find items:"
 msgstr "æ?¥æ?¾é¡¹ç?®(_F)ï¼?"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:744
 msgid "All related"
 msgstr "ç?¸å?³ç??å?¨é?¨"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:744 ../widgets/misc/e-send-options.ui.h:15
 msgid "Replies"
 msgstr "å??å¤?"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:744
 msgid "Replies and parents"
 msgstr "å??å¤?å??å??å§?é?®ä»¶"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:744
 msgid "No reply or parent"
 msgstr "æ? å??å¤?æ??å??å§?é?®ä»¶"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/e-filter-rule.c:746
 msgid "I_nclude threads"
 msgstr "å??å?«çº¿ç´¢(_N)"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/e-filter-rule.c:1119 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:331
 msgid "Incoming"
 msgstr "æ?¥æ?¶"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
+#: ../filter/e-filter-rule.c:1119 ../mail/em-utils.c:332
 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}â??ã??"
@@ -11385,7 +8847,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 "ç¼ºå°?å??ç§°ã??"
 
@@ -11409,169 +8871,879 @@ 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."
 msgstr "ä¿¡ä»¶ç??æ?¥æ??å°?ä¼?ä¸?æ??å®?æ?¥æ??ç??å??å¤?12:00è¿?è¡?æ¯?è¾?ã??"
 
-#: ../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."
 msgstr "ä¿¡ä»¶ç??æ?¥æ??å°?ä¼?å?¨è¿?æ»¤æ?§è¡?æ?¶ä¸?æ??å®?æ?¶é?´è¿?è¡?æ¯?è¾?ã??"
 
-#: ../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."
 msgstr "ä¿¡ä»¶ç??æ?¥æ??å°?ä¼?å?¨è¿?æ»¤æ?§è¡?æ?¶ä¸?å½?å??æ?¶é?´è¿?è¡?æ¯?è¾?ã??"
 
-#: ../filter/filter.glade.h:12
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "è¿?æ»¤è§?å??(_F)"
+
+#: ../filter/filter.ui.h:12
 msgid "a time relative to the current time"
 msgstr "ç?¸å¯¹äº?å½?å??æ?¶é?´ç??æ?¶é?´"
 
-#: ../filter/filter.glade.h:13
+#: ../filter/filter.ui.h:13
 msgid "ago"
 msgstr "è¿?å?»"
 
-#: ../filter/filter.glade.h:16
+#: ../filter/filter.ui.h:16
 msgid "in the future"
 msgstr "æ?ªæ?¥"
 
-#: ../filter/filter.glade.h:18
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
 msgid "months"
 msgstr "æ??"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
 msgid "seconds"
 msgstr "ç§?"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.ui.h:20
 msgid "the current time"
 msgstr "å½?å??æ?¶é?´"
 
-#: ../filter/filter.glade.h:21
+#: ../filter/filter.ui.h:21
 msgid "the time you specify"
 msgstr "æ?¨æ??å®?ç??æ?¶é?´"
 
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:674
-#: ../plugins/google-account-setup/google-contacts-source.c:341
+#: ../filter/filter.ui.h:22 ../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:517
+#: ../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 "å?¨"
 
-#: ../filter/filter.glade.h:23
+#: ../filter/filter.ui.h:23
 msgid "years"
 msgstr "å¹´"
 
-#: ../filter/rule-editor.c:382
-msgid "Add Rule"
-msgstr "æ·»å? è§?å??"
+#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:993
+#: ../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] "é??ä»¶"
 
-#: ../filter/rule-editor.c:463
-msgid "Edit Rule"
-msgstr "ç¼?è¾?è§?å??"
+#: ../mail/e-mail-attachment-bar.c:614
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "å?¾æ ?è§?å?¾"
 
-#: ../filter/rule-editor.c:809
-msgid "Rule name"
-msgstr "è§?å??å??"
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "å??è¡¨è§?å?¾"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "ç¼?å??å?¨é¦?é??é¡¹"
+#: ../mail/e-mail-browser.c:668
+#, fuzzy
+msgid "Shell Module"
+msgstr "é??æ?©æ¨¡å¼?"
+
+#: ../mail/e-mail-browser.c:669 ../mail/message-list.c:2511
+msgid "The mail shell backend"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:679
+msgid "Show Deleted"
+msgstr "æ?¾ç¤ºå? é?¤ç??"
+
+#: ../mail/e-mail-browser.c:680
+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/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/e-mail-display.c:89
+#, fuzzy
+msgid "Create Search _Folder"
+msgstr "å??å»ºæ??ç´¢æ??ä»¶å¤¹(_S)"
+
+#: ../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:555
+msgid "Add Label"
+msgstr "æ·»å? æ ?ç¾"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "ç¼?è¾?æ ?ç¾"
+
+#: ../mail/e-mail-label-manager.c:349
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "å?¨æ¤é??ç½®é?®ä»¶é¦?é??é¡¹ï¼?å??æ?¬å®?å?¨å??ä¿¡ä»¶æ?¾ç¤º"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr "æ³¨æ??ï¼?æ ?ç¾å??ä¸ç??ä¸?å??çº¿è¢«ç?¨ä½?è??å??ä¸ç??å?©è®°ç¬¦ã??"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "å?¨æ¤é??ç½®æ?¼å??æ£?æ?¥ã??ç¾å??å??ä¿¡ä»¶ç¼?å??å?¨"
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "é¢?è?²"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "å?¨è¿?é??é??ç½®æ?¨ç??ç?µå?é?®ä»¶è´¦æ?·"
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:584 ../mail/em-folder-tree.c:2571
+#: ../modules/mail/e-mail-shell-view-private.c:907
+msgid "Inbox"
+msgstr "æ?¶ä»¶ç®±"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "å?¨è¿?é??é??ç½®æ?¨ç??ç½?ç»?è¿?æ?¥è®¾ç½®"
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:577
+msgid "Drafts"
+msgstr "è??ç¨¿"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution é?®ä»¶"
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:587
+msgid "Outbox"
+msgstr "å??ä»¶ç®±"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution é?®ä»¶è´¦æ?·é??ç½®æ?§å?¶"
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:589
+msgid "Sent"
+msgstr "å·²å??ç®±"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution é?®ä»¶ç»?ä»¶"
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:580
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:574
+msgid "Templates"
+msgstr "æ¨¡æ?¿"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution é?®ä»¶æ?°å??å?¨"
+#. 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:108
+#: ../modules/calendar/e-task-shell-view-actions.c:606
+msgid "Do not ask me again"
+msgstr "ä¸?è¦?å??æ¬¡è¯¢é?®"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution é?®ä»¶æ?°å??æ?§ä»¶"
+#: ../mail/e-mail-reader.c:215 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "å¤?å?¶å?°æ??ä»¶å¤¹"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution é?®ä»¶é¦?é??é¡¹æ?§ä»¶"
+#: ../mail/e-mail-reader.c:215 ../mail/em-folder-utils.c:381
+msgid "C_opy"
+msgstr "å¤?å?¶(_O)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "Evolution ç½?ç»?é??ç½®æ?§ä»¶"
+#: ../mail/e-mail-reader.c:621 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "ç§»è?³æ??ä»¶å¤¹"
 
-#: ../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:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "é?®ä»¶"
+#: ../mail/e-mail-reader.c:621 ../mail/em-folder-utils.c:381
+msgid "_Move"
+msgstr "ç§»å?¨(_M)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
-msgid "Mail Accounts"
-msgstr "é?®ä»¶è´¦æ?·"
+#: ../mail/e-mail-reader.c:852
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "ä¿?å?ä¿¡æ?¯"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
-msgid "Mail Preferences"
-msgstr "é?®ä»¶é¦?é??é¡¹"
+#: ../mail/e-mail-reader.c:1144
+msgid "A_dd Sender to Address Book"
+msgstr "å°?å??ä»¶äººæ·»å? å?°å?°å??ç°¿(_D)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "ç½?ç»?é¦?é??é¡¹"
+#: ../mail/e-mail-reader.c:1146
+msgid "Add sender to address book"
+msgstr "å°?å??ä»¶äººæ·»å? å?°å?°å??ç°¿"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-msgid "_Mail"
-msgstr "é?®ä»¶(_M)"
+#: ../mail/e-mail-reader.c:1151
+msgid "Check for _Junk"
+msgstr "æ£?æ?¥å??å?¾ä¿¡(_J)"
+
+#: ../mail/e-mail-reader.c:1153
+msgid "Filter the selected messages for junk status"
+msgstr "æ??é??ä¸ç??ä¿¡ä»¶æ ?è®°ä¸ºå??å?¾é?®ä»¶"
+
+#: ../mail/e-mail-reader.c:1160
+msgid "Copy selected messages to the clipboard"
+msgstr "å°?é??ä¸ä¿¡ä»¶å¤?å?¶å?°å?ªè´´æ?¿"
+
+#: ../mail/e-mail-reader.c:1165
+msgid "_Copy to Folder..."
+msgstr "å¤?å?¶å?°æ??ä»¶å¤¹(_C)..."
+
+#: ../mail/e-mail-reader.c:1167
+msgid "Copy selected messages to another folder"
+msgstr "æ??é??ä¸ç??ä¿¡ä»¶å¤?å?¶å?°å?¶å®?æ??ä»¶å¤¹"
+
+#: ../mail/e-mail-reader.c:1172
+msgid "_Delete Message"
+msgstr "å? é?¤ä¿¡ä»¶(_D)"
+
+#: ../mail/e-mail-reader.c:1174
+msgid "Mark the selected messages for deletion"
+msgstr "ä¸ºé??ä¸ä¿¡ä»¶å??å? é?¤æ ?è®°"
+
+#: ../mail/e-mail-reader.c:1179
+msgid "Filter on Mailing _List..."
+msgstr "æ ¹æ?®é?®ä»¶å??è¡¨è¿?æ»¤(_L)..."
+
+#: ../mail/e-mail-reader.c:1181
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "å??å»ºå?¯è¿?æ»¤å¯?å¾?æ¤é?®ä»¶å??è¡¨ç??ä¿¡ä»¶ç??è§?å??"
+
+#: ../mail/e-mail-reader.c:1186
+msgid "Filter on _Recipients..."
+msgstr "æ ¹æ?®æ?¶ä»¶äººè¿?æ»¤(_R)..."
+
+#: ../mail/e-mail-reader.c:1188
+msgid "Create a rule to filter messages to these recipients"
+msgstr "å??å»ºå?¯è¿?æ»¤å¯?å¾?è¿?äº?æ?¶ä»¶äººç??ä¿¡ä»¶ç??è§?å??"
+
+#: ../mail/e-mail-reader.c:1193
+msgid "Filter on Se_nder..."
+msgstr "æ ¹æ?®å??ä»¶äººè¿?æ»¤(_N)..."
+
+#: ../mail/e-mail-reader.c:1195
+msgid "Create a rule to filter messages from this sender"
+msgstr "å??å»ºå?¯è¿?æ»¤æ¤äººå¯?æ?¥ç??ä¿¡ä»¶ç??è§?å??"
+
+#: ../mail/e-mail-reader.c:1200
+msgid "Filter on _Subject..."
+msgstr "æ ¹æ?®ä¸»é¢?è¿?æ»¤(_S)..."
+
+#: ../mail/e-mail-reader.c:1202
+msgid "Create a rule to filter messages with this subject"
+msgstr "å??å»ºå?¯è¿?æ»¤æ¤ä¸»é¢?ä¿¡ä»¶ç??è§?å??"
+
+#: ../mail/e-mail-reader.c:1207
+msgid "A_pply Filters"
+msgstr "åº?ç?¨è¿?æ»¤è§?å??(_P)"
+
+#: ../mail/e-mail-reader.c:1209
+msgid "Apply filter rules to the selected messages"
+msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°é??ä¸ç??ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1214
+msgid "_Find in Message..."
+msgstr "å?¨ä¿¡ä»¶ä¸æ?¥æ?¾(_F)..."
+
+#: ../mail/e-mail-reader.c:1216
+msgid "Search for text in the body of the displayed message"
+msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??ä¸»ä½?ä¸æ??ç´¢æ??æ?¬"
+
+#: ../mail/e-mail-reader.c:1221
+msgid "_Clear Flag"
+msgstr "æ¸?é?¤æ ?å¿?(_C)"
+
+#: ../mail/e-mail-reader.c:1223
+#, fuzzy
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "å??æ¶?é??ä¸ä¿¡ä»¶ç??å? é?¤"
+
+#: ../mail/e-mail-reader.c:1228
+msgid "_Flag Completed"
+msgstr "æ ?å¿?ä¸ºå·²å®?æ??(_F)"
+
+#: ../mail/e-mail-reader.c:1230
+#, fuzzy
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "æ??å??ä¸?çº¿ç´¢ä¸ç??æ??æ??ä¿¡ä»¶é??æ?©ä¸ºé??ä¸ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1235
+msgid "Follow _Up..."
+msgstr "è·?é??(_U)..."
+
+#: ../mail/e-mail-reader.c:1237
+#, fuzzy
+msgid "Flag the selected messages for follow-up"
+msgstr "ä¸ºé??ä¸ä¿¡ä»¶å??è·?é??æ ?å¿?"
+
+#: ../mail/e-mail-reader.c:1242
+msgid "_Attached"
+msgstr "é??ä»¶(_A)"
+
+#: ../mail/e-mail-reader.c:1244 ../mail/e-mail-reader.c:1251
+msgid "Forward the selected message to someone as an attachment"
+msgstr "æ??é??ä¸ä¿¡ä»¶ä½?ä¸ºé??ä»¶è½¬å??ç»?æ??äºº"
+
+#: ../mail/e-mail-reader.c:1249
+#, fuzzy
+msgid "Forward As _Attached"
+msgstr "ä½?ä¸º iCalendar è½¬å??(_F)"
+
+#: ../mail/e-mail-reader.c:1256
+msgid "_Inline"
+msgstr "åµ?å?¥(_I)"
+
+#: ../mail/e-mail-reader.c:1258 ../mail/e-mail-reader.c:1265
+msgid "Forward the selected message in the body of a new message"
+msgstr "å?¨æ?°ä¿¡ä½?ä¸è½¬å??é??ä¸ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1263
+#, fuzzy
+msgid "Forward As _Inline"
+msgstr "è½¬å??æ?¹å¼?(_F)ï¼?"
+
+#: ../mail/e-mail-reader.c:1270
+msgid "_Quoted"
+msgstr "å¼?ç?¨(_Q)"
+
+#: ../mail/e-mail-reader.c:1272 ../mail/e-mail-reader.c:1279
+msgid "Forward the selected message quoted like a reply"
+msgstr "ä»¥ç±»ä¼¼äº?å??å¤?ç??å¼?ç?¨æ?¹å¼?è½¬å??é??ä¸ç??ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1277
+#, fuzzy
+msgid "Forward As _Quoted"
+msgstr "è½¬å??æ?¹å¼?(_F)ï¼?"
+
+#: ../mail/e-mail-reader.c:1284
+msgid "_Load Images"
+msgstr "è£?å?¥å?¾å??(_L)"
+
+#: ../mail/e-mail-reader.c:1286
+msgid "Force images in HTML mail to be loaded"
+msgstr "å¼ºå?¶è£?å?¥ HTML é?®ä»¶ä¸ç??å?¾å??"
+
+#: ../mail/e-mail-reader.c:1291
+msgid "_Important"
+msgstr "é??è¦?(_I)"
+
+#: ../mail/e-mail-reader.c:1293
+msgid "Mark the selected messages as important"
+msgstr "æ??é??ä¸ä¿¡ä»¶æ ?è®°ä¸ºé??è¦?é?®ä»¶"
+
+#: ../mail/e-mail-reader.c:1298
+msgid "_Junk"
+msgstr "å??å?¾(_J)"
+
+#: ../mail/e-mail-reader.c:1300
+msgid "Mark the selected messages as junk"
+msgstr "æ??é??ä¸ä¿¡ä»¶æ ?è®°ä¸ºå??å?¾é?®ä»¶"
+
+#: ../mail/e-mail-reader.c:1305
+msgid "_Not Junk"
+msgstr "é??å??å?¾(_N)"
+
+#: ../mail/e-mail-reader.c:1307
+msgid "Mark the selected messages as not being junk"
+msgstr "æ??é??ä¸ä¿¡ä»¶æ ?è®°ä¸ºé??å??å?¾é?®ä»¶"
+
+#: ../mail/e-mail-reader.c:1312
+msgid "_Read"
+msgstr "è¯»å??(_R)"
+
+#: ../mail/e-mail-reader.c:1314
+msgid "Mark the selected messages as having been read"
+msgstr "æ??é??ä¸ä¿¡ä»¶æ ?è®°ä¸ºå·²è¯»"
+
+#: ../mail/e-mail-reader.c:1319
+msgid "Uni_mportant"
+msgstr "ä¸?é??è¦?(_M)"
+
+#: ../mail/e-mail-reader.c:1321
+msgid "Mark the selected messages as unimportant"
+msgstr "æ??é??ä¸ä¿¡ä»¶æ ?è®°ä¸ºä¸?é??è¦?é?®ä»¶"
+
+#: ../mail/e-mail-reader.c:1326
+msgid "_Unread"
+msgstr "æ?ªè¯»(_U)"
+
+#: ../mail/e-mail-reader.c:1328
+msgid "Mark the selected messages as not having been read"
+msgstr "æ??é??ä¸ä¿¡ä»¶æ ?è®°ä¸ºæ?ªè¯»"
+
+#: ../mail/e-mail-reader.c:1333
+msgid "_Edit as New Message..."
+msgstr "ä½?ä¸ºæ?°ä¿¡ä»¶è¿?è¡?ç¼?è¾?(_E)..."
+
+#: ../mail/e-mail-reader.c:1335
+msgid "Open the selected messages in the composer for editing"
+msgstr "å?¨æ?°å??å?¨ä¸æ??å¼?é??ä¸ç??ä¿¡ä»¶ä»¥ä¾¿ç¼?è¾?"
+
+#: ../mail/e-mail-reader.c:1340
+msgid "Compose _New Message"
+msgstr "æ?°å??æ?°ä¿¡ä»¶(_N)"
+
+#: ../mail/e-mail-reader.c:1342
+msgid "Open a window for composing a mail message"
+msgstr "æ??å¼?çª?å?£ä»¥æ?°å??ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1347
+msgid "_Open in New Window"
+msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?(_O)"
+
+#: ../mail/e-mail-reader.c:1349
+msgid "Open the selected messages in a new window"
+msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?é??ä¸ç??ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1354
+msgid "_Move to Folder..."
+msgstr "ç§»è?³æ??ä»¶å¤¹(_M)..."
+
+#: ../mail/e-mail-reader.c:1356
+msgid "Move selected messages to another folder"
+msgstr "æ??é??ä¸ç??ä¿¡ä»¶ç§»è?³å?¶å®?æ??ä»¶å¤¹"
+
+#: ../mail/e-mail-reader.c:1361
+msgid "_Next Message"
+msgstr "ä¸?ä¸?å°?ä¿¡(_N)"
+
+#: ../mail/e-mail-reader.c:1363
+msgid "Display the next message"
+msgstr "æ?¾ç¤ºä¸?ä¸?å°?ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1368
+msgid "Next _Important Message"
+msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡ä»¶(_I)"
+
+#: ../mail/e-mail-reader.c:1370
+msgid "Display the next important message"
+msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1375
+msgid "Next _Thread"
+msgstr "ä¸?ä¸?æ?¡çº¿ç´¢(_T)"
+
+#: ../mail/e-mail-reader.c:1377
+msgid "Display the next thread"
+msgstr "æ?¾ç¤ºä¸?ä¸?æ?¡çº¿ç´¢"
+
+#: ../mail/e-mail-reader.c:1382
+msgid "Next _Unread Message"
+msgstr "ä¸?ä¸?å°?æ?ªè¯»ä¿¡ä»¶(_U)"
+
+#: ../mail/e-mail-reader.c:1384
+msgid "Display the next unread message"
+msgstr "æ?¾ç¤ºä¸?ä¸?å°?æ?ªè¯»ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1389
+msgid "_Previous Message"
+msgstr "ä¸?ä¸?å°?ä¿¡(_P)"
+
+#: ../mail/e-mail-reader.c:1391
+msgid "Display the previous message"
+msgstr "æ?¾ç¤ºä¸?ä¸?å°?ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1396
+msgid "Pr_evious Important Message"
+msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡ä»¶(_E)"
+
+#: ../mail/e-mail-reader.c:1398
+msgid "Display the previous important message"
+msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1403
+msgid "P_revious Unread Message"
+msgstr "ä¸?ä¸?å°?æ?ªè¯»ä¿¡ä»¶(_R)"
+
+#: ../mail/e-mail-reader.c:1405
+msgid "Display the previous unread message"
+msgstr "æ?¾ç¤ºä¸?ä¸?å°?æ?ªè¯»ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1412
+msgid "Print this message"
+msgstr "æ??å?°è¯¥ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1419
+msgid "Preview the message to be printed"
+msgstr "é¢?è§?è¦?æ??å?°ç??ä¿¡ä»¶"
+
+#: ../mail/e-mail-reader.c:1424
+msgid "Re_direct"
+msgstr "é??å??(_D)"
+
+#: ../mail/e-mail-reader.c:1426
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "å°?é??ä¸ä¿¡ä»¶é??å??(é??å??)ç»?æ??äºº"
+
+#: ../mail/e-mail-reader.c:1431
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "å??å¤?æ??æ??äºº(_A)"
+
+#: ../mail/e-mail-reader.c:1433
+#, fuzzy
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "ä¸ºé??ä¸ä¿¡ä»¶ç??æ??æ??æ?¶ä»¶äººæ?°å??å??å¤?"
+
+#: ../mail/e-mail-reader.c:1438
+msgid "Reply to _List"
+msgstr "å??å¤?é?®ä»¶å??è¡¨(_L)"
+
+#: ../mail/e-mail-reader.c:1440
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "ä¸ºé??ä¸ä¿¡ä»¶ç??é?®ä»¶å??è¡¨æ?°å??å??å¤?"
+
+#: ../mail/e-mail-reader.c:1445
+#: ../modules/mail/e-mail-attachment-handler.c:148
+msgid "_Reply to Sender"
+msgstr "å??å¤?å??ä»¶äºº(_R)"
+
+#: ../mail/e-mail-reader.c:1447
+msgid "Compose a reply to the sender of the selected message"
+msgstr "ä¸ºé??ä¸ä¿¡ä»¶ç??å??ä»¶äººæ?°å??å??å¤?"
+
+#: ../mail/e-mail-reader.c:1452
+#, fuzzy
+msgid "_Save as mbox..."
+msgstr "å?¦å?ä¸º..."
+
+#: ../mail/e-mail-reader.c:1454
+#, fuzzy
+msgid "Save selected messages as an mbox file"
+msgstr "æ??é??ä¸ä¿¡ä»¶å?¦å?ä¸ºæ??æ?¬æ??ä»¶"
+
+#: ../mail/e-mail-reader.c:1459
+msgid "Search Folder from Mailing _List..."
+msgstr "å?ºäº?é?®ä»¶å??è¡¨ç??æ??ç´¢æ??ä»¶å¤¹(_L)..."
+
+#: ../mail/e-mail-reader.c:1461
+#, fuzzy
+msgid "Create a search folder for this mailing list"
+msgstr "ä¸ºè¯¥é?®ä»¶å??è¡¨å??å»ºæ??ç´¢æ??ä»¶å¤¹"
+
+#: ../mail/e-mail-reader.c:1466
+msgid "Search Folder from Recipien_ts..."
+msgstr "å?ºäº?æ?¶ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_T)..."
+
+#: ../mail/e-mail-reader.c:1468
+#, fuzzy
+msgid "Create a search folder for these recipients"
+msgstr "ä¸ºè¿?äº?æ?¶ä»¶äººå??å»ºæ??ç´¢æ??ä»¶å¤¹"
+
+#: ../mail/e-mail-reader.c:1473
+msgid "Search Folder from Sen_der..."
+msgstr "å?ºäº?å??ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_D)..."
+
+#: ../mail/e-mail-reader.c:1475
+#, fuzzy
+msgid "Create a search folder for this sender"
+msgstr "ä¸ºè¯¥å??ä»¶äººå??å»ºæ??ç´¢æ??ä»¶å¤¹"
+
+#: ../mail/e-mail-reader.c:1480
+msgid "Search Folder from S_ubject..."
+msgstr "å?ºäº?ä¸»é¢?ç??æ??ç´¢æ??ä»¶å¤¹(_U)..."
+
+#: ../mail/e-mail-reader.c:1482
+#, fuzzy
+msgid "Create a search folder for this subject"
+msgstr "ä¸ºè¯¥ä¸»é¢?å??å»ºæ??ç´¢æ??ä»¶å¤¹"
+
+#: ../mail/e-mail-reader.c:1487
+msgid "Select _All Text"
+msgstr "é??ä¸æ??æ??æ??å?(_A)"
+
+#: ../mail/e-mail-reader.c:1489
+msgid "Select all the text in a message"
+msgstr "é??ä¸ä¿¡ä»¶ä¸ç??å?¨é?¨æ??æ?¬"
+
+#: ../mail/e-mail-reader.c:1494
+msgid "_Message Source"
+msgstr "ä¿¡ä»¶æº?ä»£ç ?(_M)"
+
+#: ../mail/e-mail-reader.c:1496
+msgid "Show the raw email source of the message"
+msgstr "æ?¾ç¤ºä¿¡ä»¶ç??å??å§?é?®ä»¶æº?ä»£ç ?"
+
+#: ../mail/e-mail-reader.c:1508
+msgid "_Undelete Message"
+msgstr "å??æ¶?å? é?¤ä¿¡ä»¶(_U)"
+
+#: ../mail/e-mail-reader.c:1510
+msgid "Undelete the selected messages"
+msgstr "å??æ¶?é??ä¸ä¿¡ä»¶ç??å? é?¤"
+
+#: ../mail/e-mail-reader.c:1515
+msgid "_Normal Size"
+msgstr "æ?®é??å¤§å°?(_N)"
+
+#: ../mail/e-mail-reader.c:1517
+msgid "Reset the text to its original size"
+msgstr "æ??æ??æ?¬é??æ?°è®¾ç½®ä¸ºå??æ?¥ç??å¤§å°?"
+
+#: ../mail/e-mail-reader.c:1522
+msgid "_Zoom In"
+msgstr "æ?¾å¤§(_Z)"
+
+#: ../mail/e-mail-reader.c:1524
+msgid "Increase the text size"
+msgstr "å¢?å? æ??æ?¬å¤§å°?"
+
+#: ../mail/e-mail-reader.c:1529
+msgid "Zoom _Out"
+msgstr "ç¼©å°?(_O)"
+
+#: ../mail/e-mail-reader.c:1531
+msgid "Decrease the text size"
+msgstr "å??å°?æ??æ?¬å¤§å°?"
+
+#: ../mail/e-mail-reader.c:1538
+msgid "Create R_ule"
+msgstr "å??å»ºè§?å??(_U)"
+
+#: ../mail/e-mail-reader.c:1545
+msgid "Ch_aracter Encoding"
+msgstr "å?ç¬¦ç¼?ç ?(_A)"
+
+#: ../mail/e-mail-reader.c:1552
+msgid "F_orward As"
+msgstr "è½¬å??ä¸º(_O)"
+
+#: ../mail/e-mail-reader.c:1559
+msgid "_Go To"
+msgstr "è½¬å?°(_G)"
+
+#: ../mail/e-mail-reader.c:1566
+msgid "Mar_k As"
+msgstr "æ ?è®°ä¸º(_K)"
+
+#: ../mail/e-mail-reader.c:1573
+msgid "_Message"
+msgstr "ä¿¡ä»¶(_M)"
+
+#: ../mail/e-mail-reader.c:1580
+msgid "_Zoom"
+msgstr "ç¼©æ?¾(_Z)"
+
+#: ../mail/e-mail-reader.c:1609
+msgid "Mark for Follo_w Up..."
+msgstr "æ ?è®°ä¸ºè·?é??(_W)..."
+
+#: ../mail/e-mail-reader.c:1617
+msgid "Mark as _Important"
+msgstr "æ ?è®°ä¸ºé??è¦?(_I)"
+
+#: ../mail/e-mail-reader.c:1621
+msgid "Mark as _Junk"
+msgstr "æ ?è®°ä¸ºå??å?¾(_J)"
+
+#: ../mail/e-mail-reader.c:1625
+msgid "Mark as _Not Junk"
+msgstr "æ ?è®°ä¸ºé??å??å?¾(_N)"
+
+#: ../mail/e-mail-reader.c:1629
+msgid "Mar_k as Read"
+msgstr "æ ?è®°ä¸ºå·²è¯»(_K)"
+
+#: ../mail/e-mail-reader.c:1633
+msgid "Mark as Uni_mportant"
+msgstr "æ ?è®°ä¸ºä¸?é??è¦?(_M)"
+
+#: ../mail/e-mail-reader.c:1637
+msgid "Mark as _Unread"
+msgstr "æ ?è®°ä¸ºæ?ªè¯»(_U)"
+
+#: ../mail/e-mail-reader.c:1673
+msgid "_Caret Mode"
+msgstr "å??æ ?æ¨¡å¼?(_C)"
+
+#: ../mail/e-mail-reader.c:1675
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??ä¿¡ä½?ä¸æ?¾ç¤ºé?ªç??å??æ ?"
+
+#: ../mail/e-mail-reader.c:1681
+msgid "All Message _Headers"
+msgstr "å?¨é?¨ä¿¡å¤´(_H)"
+
+#: ../mail/e-mail-reader.c:1683
+msgid "Show messages with all email headers"
+msgstr "æ?¾ç¤ºé?®ä»¶æ?¶æ?¾ç¤ºæ??æ??ä¿¡å¤´"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-mail-reader.c:1904
+msgid "Unable to retrieve message"
+msgstr "æ? æ³?è?·å??ä¿¡ä»¶"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:2402
+#: ../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:2518
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "è½¬å??(_F)"
+
+#: ../mail/e-mail-reader.c:2519
+msgid "Forward the selected message to someone"
+msgstr "æ??é??ä¸ä¿¡ä»¶è½¬å??ç»?æ??äºº"
+
+#: ../mail/e-mail-reader.c:2567 ../mail/em-filter-i18n.h:14
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+#: ../modules/calendar/e-cal-shell-view-actions.c:1784
+#: ../modules/calendar/e-memo-shell-view-actions.c:979
+#: ../modules/calendar/e-task-shell-view-actions.c:1178
+#: ../plugins/groupwise-features/share-folder.c:754
+msgid "Delete"
+msgstr "å? é?¤"
+
+#: ../mail/e-mail-reader.c:2571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "ä¸?ä¸?é¡¹"
+
+#: ../mail/e-mail-reader.c:2575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "ä¸?ä¸?é¡¹"
+
+#: ../mail/e-mail-reader.c:2579 ../mail/mail-dialogs.ui.h:18
+msgid "Reply"
+msgstr "å??å¤?"
+
+#: ../mail/e-mail-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "å?¹é??ï¼?%d"
+
+#: ../mail/e-mail-search-bar.c:552
+msgid "Close the find bar"
+msgstr "å?³é?æ?¥æ?¾æ ?"
+
+#: ../mail/e-mail-search-bar.c:560
+msgid "Fin_d:"
+msgstr "æ?¥æ?¾(_D)ï¼?"
+
+#: ../mail/e-mail-search-bar.c:572
+msgid "Clear the search"
+msgstr "æ¸?é?¤æ??ç´¢"
+
+#: ../mail/e-mail-search-bar.c:595
+msgid "_Previous"
+msgstr "ä¸?ä¸?é¡¹(_P)"
+
+#: ../mail/e-mail-search-bar.c:601
+msgid "Find the previous occurrence of the phrase"
+msgstr "å¯»æ?¾è¯¥è¯?å?¥å?ºç?°ç??å??ä¸?ä¸ªä½?ç½®"
+
+#: ../mail/e-mail-search-bar.c:611
+msgid "_Next"
+msgstr "ä¸?ä¸?é¡¹(_N)"
+
+#: ../mail/e-mail-search-bar.c:617
+msgid "Find the next occurrence of the phrase"
+msgstr "å¯»æ?¾è¯¥è¯?å?¥å?ºç?°ç??ä¸?ä¸?ä¸ªä½?ç½®"
+
+#: ../mail/e-mail-search-bar.c:627
+msgid "Mat_ch case"
+msgstr "å¤§å°?å??å?¹é??(_C)"
+
+#: ../mail/e-mail-search-bar.c:655
+msgid "Reached bottom of page, continued from top"
+msgstr "å?°è¾¾é¡µé?¢åº?é?¨ï¼?ç§»å?°é¡¶é?¨ç»§ç»"
+
+#: ../mail/e-mail-search-bar.c:677
+msgid "Reached top of page, continued from bottom"
+msgstr "å?°è¾¾é¡µé?¢é¡¶é?¨ï¼?ç§»å?°åº?é?¨ç»§ç»"
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
+#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1563
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:120
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:107
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:110
+#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/mail/e-mail-shell-migrate.c:2932
+msgid "On This Computer"
+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: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:488 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:19
+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:492 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "SSL å? å¯?"
+
+#: ../mail/em-account-editor.c:579
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s è®¸å?¯å??è®®"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:586
 #, c-format
 msgid ""
 "\n"
@@ -11583,118 +9755,148 @@ msgstr ""
 "è¯·ä»?ç»?é??è¯»ä¸?æ?¹æ?¾ç¤ºç?? %s è®¸å?¯å??è®®\n"
 "å¹¶é??ä¸å¤?é??æ¡?è¡¨æ??æ?¨æ?¥å??è¯¥å??è®®\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "é??æ?©æ??ä»¶å¤¹"
+#: ../mail/em-account-editor.c:948
+msgid "Never"
+msgstr "ä»?ä¸?"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "è?ªå?¨ç??æ??ç??"
+#: ../mail/em-account-editor.c:949
+msgid "Always"
+msgstr "æ?»æ?¯"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:950
 msgid "Ask for each message"
 msgstr "æ¯?å°?ä¿¡é?½è¯¢é?®"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:2025
+msgid "Mail Configuration"
+msgstr "é?®ä»¶é??ç½®"
+
+#: ../mail/em-account-editor.c:2026
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"æ¬¢è¿?ä½¿ç?¨ Evolution é?®ä»¶é??ç½®å?©æ??ã??\n"
+"\n"
+"å??å?»â??å??è¿?â??å¼?å§?ã??"
+
+#: ../mail/em-account-editor.c:2028 ../mail/em-account-editor.c:2164
+#: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "æ ?è¯?"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2029
+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:2031 ../mail/em-account-editor.c:2201
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶ç?µå?é?®ä»¶"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2032
+msgid "Please configure the following account settings."
+msgstr "è¯·é??ç½®ä¸?å??å¸?æ?·è®¾ç½®ã??"
+
+#: ../mail/em-account-editor.c:2034 ../mail/em-account-editor.c:2657
+msgid "Sending Email"
+msgstr "å??é??ç?µå?é?®ä»¶"
+
+#: ../mail/em-account-editor.c:2035
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"è¯·å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å??ä»¶æ??å?¡å?¨ä¿¡æ?¯ã??å¦?æ??æ?¨ä¸?å¤ªç¡®å®?ç??è¯?ï¼?è¯·è¯¢é?®æ?¨ç??ç³»ç»?ç®¡ç??å??æ??è??"
+"äº?è??ç½?æ??å?¡æ??ä¾?å??ISPã??"
+
+#: ../mail/em-account-editor.c:2037
+msgid "Account Management"
+msgstr "è´¦æ?·ç®¡ç??"
+
+#: ../mail/em-account-editor.c:2038
+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:2042
+msgid "Done"
+msgstr "å®?æ??"
+
+#: ../mail/em-account-editor.c:2043
+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:2473
 msgid "Check for _new messages every"
 msgstr "è?ªå?¨æ£?æ?¥æ?°é?®ä»¶ç??é?´é??(_N)"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2481
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
-msgid "Sending Email"
-msgstr "å??é??ç?µå?é?®ä»¶"
-
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2715 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "é»?è®¤"
 
-#. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2777 ../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:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2814 ../mail/em-account-editor.c:2882
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é??é¡¹"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2815 ../mail/em-account-editor.c:2883
 msgid "Checking for New Messages"
 msgstr "æ£?æ?¥æ?°é?®ä»¶"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3346
 msgid "Account Editor"
 msgstr "è´¦æ?·ç¼?è¾?å?¨"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3346
 msgid "Evolution Account Assistant"
 msgstr "Evolution è´¦æ?·å?©æ??"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
-msgid "[Default]"
-msgstr "[é»?è®¤]"
-
-#: ../mail/em-account-prefs.c:488
-msgid "Account name"
-msgstr "è´¦æ?·å??"
-
-#: ../mail/em-account-prefs.c:490
-msgid "Protocol"
-msgstr "å??è®®"
-
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
-msgid "Unnamed"
-msgstr "æ?ªå?½å??"
-
-#: ../mail/em-composer-prefs.c:970
-msgid "Language(s)"
-msgstr "è¯è¨?"
-
-#: ../mail/em-composer-prefs.c:1019
-msgid "Add signature script"
-msgstr "æ·»å? ç¾å??è??æ?¬"
-
-#: ../mail/em-composer-prefs.c:1061
-msgid "Signature(s)"
-msgstr "ç¾å??"
-
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
-msgid "-------- Forwarded Message --------"
-msgstr "-------- è½¬å??ç??ä¿¡ä»¶ --------"
-
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1687
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
-msgstr ""
+msgstr "ç¼ºå°?å??é??ç?®æ ?å?°å??ï¼?é?®ä»¶è½¬å??è¢«å??æ¶?ã??"
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1693
 msgid "No account found to use, forward of the message has been cancelled."
-msgstr ""
+msgstr "æ? å?¯ç?¨è´¦æ?·ï¼?é?®ä»¶è½¬å??è¢«å??æ¶?ã??"
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:2136
 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
+#: ../mail/em-composer-utils.c:2183
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11702,13 +9904,21 @@ msgstr ""
 "å?¨ ${Year}-${Month}-${Day}${AbbrevWeekdayName}ç?? ${24Hour}:${Minute} "
 "${TimeZone}ï¼?${Sender}å??é??ï¼?"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2327
 msgid "-----Original Message-----"
 msgstr "-------- å??å§?ä¿¡ä»¶ --------"
 
-#: ../mail/em-filter-editor.c:156
-msgid "_Filter Rules"
-msgstr "è¿?æ»¤è§?å??(_F)"
+#: ../mail/em-composer-utils.c:2507
+msgid "Posting destination"
+msgstr "æ??é??ç?®ç??"
+
+#: ../mail/em-composer-utils.c:2508
+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
@@ -11739,10 +9949,6 @@ msgstr "CC"
 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 "æ?¥æ?¶æ?¥æ??"
@@ -11751,14 +9957,6 @@ msgstr "æ?¥æ?¶æ?¥æ??"
 msgid "Date sent"
 msgstr "å??é??æ?¥æ??"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
-#: ../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 "å·²å? é?¤"
@@ -11803,229 +10001,176 @@ msgstr "è¡¨è¾¾å¼?"
 msgid "Follow Up"
 msgstr "è·?é??"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "è½¬å??è?³"
+
+#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:956
 msgid "Important"
 msgstr "é??è¦?"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "ä¹?å??"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "ä¹?å??"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "å·²æ ?å¿?"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "æ?ªæ ?å¿?"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "æ?ªè®¾ç½®"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "å·²è®¾ç½®"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "å??å?¾"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "å??å?¾æµ?è¯?"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "æ ?ç¾"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "é?®ä»¶å??è¡¨"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "å?¨é?¨å?¹é??"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "ä¿¡ä½?"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "ä¿¡å¤´"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "æ?¯å??å?¾é?®ä»¶"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?®ä»¶"
 
-#: ../mail/em-filter-i18n.h:49
-msgid "Move to Folder"
-msgstr "ç§»è?³æ??ä»¶å¤¹"
-
 #: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "ä¿¡ä»¶ä½?ç½®"
+
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "ç®¡é??å?°ç¨?åº?"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "æ?æ?¾å£°é?³"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#. 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:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "æ?¶ä»¶äºº"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "æ£å??è¡¨è¾¾å¼?å?¹é??"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "å·²å??å¤?å?°"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "è¿?å??"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "è¿?å??å¤§äº?"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "è¿?å??å°?äº?"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "è¿?è¡?ç¨?åº?"
 
-#: ../mail/em-filter-i18n.h:60 ../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:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "å??é??è??"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "å??é??è??æ??æ?¥æ?¶è??"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "è®¾ç½®æ ?ç¾"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "è®¾ç½®ç?¶æ??"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "å¤§å°?(kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "å??é?³ç±»ä¼¼"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "æ?¥æº?è´¦æ?·"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "æ??å®?ä¿¡å¤´"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "å¼?å§?äº?"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "å??æ¢å¤?ç??"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
-msgid "Subject"
-msgstr "ä¸»é¢?"
-
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "å??æ¶?ç?¶æ??"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "ç?¶å??"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "æ·»å? å?¨ä½?(_T)"
 
-#: ../mail/em-folder-browser.c:192
-msgid "C_reate Search Folder From Search..."
-msgstr "ä»?å¤´å??å»ºæ??ç´¢æ??ä»¶å¤¹(_R)..."
-
-#: ../mail/em-folder-browser.c:217
-msgid "All Messages"
-msgstr "å?¨é?¨ä¿¡ä»¶"
-
-#: ../mail/em-folder-browser.c:218
-msgid "Unread Messages"
-msgstr "æ?ªè¯»ä¿¡ä»¶"
-
-#: ../mail/em-folder-browser.c:220
-msgid "No Label"
-msgstr "æ? æ ?ç¾"
-
-#: ../mail/em-folder-browser.c:227
-msgid "Read Messages"
-msgstr "å·²è¯»ä¿¡ä»¶"
-
-#: ../mail/em-folder-browser.c:228
-msgid "Recent Messages"
-msgstr "æ??è¿?ä¿¡ä»¶"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Last 5 Days' Messages"
-msgstr "å??äº?å¤©ç??ä¿¡ä»¶"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Messages with Attachments"
-msgstr "æ??é??ä»¶ç??ä¿¡ä»¶"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Important Messages"
-msgstr "é??è¦?ä¿¡ä»¶"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Messages Not Junk"
-msgstr "ä¸?æ?¯å??å?¾é?®ä»¶"
-
-#: ../mail/em-folder-browser.c:1173
-msgid "Account Search"
-msgstr "è´¦æ?·æ??ç´¢"
-
-#: ../mail/em-folder-browser.c:1226
-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:"
@@ -12049,70 +10194,56 @@ msgstr "é??é¢?ä½¿ç?¨(%s)ï¼?"
 msgid "Quota usage"
 msgstr "é??é¢?ä½¿ç?¨"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
-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:254
+#: ../mail/em-folder-selector.c:267
 msgid "C_reate"
 msgstr "å??å»º(_R)"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:271
 msgid "Folder _name:"
 msgstr "æ??ä»¶å¤¹å??ç§°(_N)ï¼?"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/mail-vfolder.c:968 ../mail/mail-vfolder.c:1024
 msgid "Search Folders"
 msgstr "æ??ç´¢æ??ä»¶å¤¹"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#. 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:504 ../mail/mail-component.c:165
-msgid "Drafts"
-msgstr "è??ç¨¿"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "æ¨¡æ?¿"
-
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
-msgid "Outbox"
-msgstr "å??ä»¶ç®±"
-
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
-msgid "Sent"
-msgstr "å·²å??ç®±"
-
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:648 ../mail/em-folder-tree-model.c:985
 msgid "Loading..."
 msgstr "æ£å?¨è£?å?¥..."
 
+#: ../mail/em-folder-tree.c:188
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "å?¨â??%sâ??ä¸æ?«æ??æ??ä»¶å¤¹"
+
+#: ../mail/em-folder-tree.c:445
+msgid "Folder names cannot contain '/'"
+msgstr "æ??ä»¶å¤¹å??ä¸?è?½å?«æ??å?ç¬¦â??/â??"
+
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
@@ -12122,373 +10253,139 @@ msgstr "æ£å?¨è£?å?¥..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
-#, c-format
+#: ../mail/em-folder-tree.c:978
+#, fuzzy, c-format
 msgctxt "folder-display"
-msgid "%s (%u)"
+msgid "%s (%u%s)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:1309
 msgid "Mail Folder Tree"
 msgstr "é?®ä»¶æ??ä»¶å¤¹æ ?"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:1476
 #, c-format
 msgid "Moving folder %s"
 msgstr "ç§»å?¨æ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:1478
 #, c-format
 msgid "Copying folder %s"
 msgstr "å¤?å?¶æ??ä»¶å¤¹ %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
+#: ../mail/em-folder-tree.c:1485 ../mail/message-list.c:2076
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ??ä¿¡ä»¶ç§»è?³æ??ä»¶å¤¹ %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
+#: ../mail/em-folder-tree.c:1487 ../mail/message-list.c:2078
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ??ä¿¡ä»¶å¤?å?¶å?°æ??ä»¶å¤¹ %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:1502
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "æ? æ³?å°?ä¿¡ä»¶æ?¾å?°é¡¶çº§æ??ä»¶å¤¹å?å?¨"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
-msgid "_Copy to Folder"
-msgstr "å¤?å?¶å?°æ??ä»¶å¤¹(_C)"
-
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
-msgid "_Move to Folder"
-msgstr "ç§»è?³æ??ä»¶å¤¹(_M)"
-
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "å?¨â??%sâ??ä¸æ?«æ??æ??ä»¶å¤¹"
-
-#: ../mail/em-folder-tree.c:2117
-msgid "Open in _New Window"
-msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?(_N)"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
-msgid "_New Folder..."
-msgstr "æ?°å»ºæ??ä»¶å¤¹(_N)..."
-
-#: ../mail/em-folder-tree.c:2125
-msgid "_Move..."
-msgstr "ç§»å?¨(_M)..."
-
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "å?·æ?°(_F)"
-
-#: ../mail/em-folder-tree.c:2134
-msgid "Fl_ush Outbox"
-msgstr "æ¸?ç©ºå??ä»¶ç®±(_U)"
-
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "æ¸?ç©ºå??æ?¶ç«?(_E)"
-
-#: ../mail/em-folder-tree.c:2243
-msgid "_Unread Search Folder"
-msgstr "æ?ªè¯»æ??ç´¢æ??ä»¶å¤¹(_U)"
-
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:98
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "æ??â??%sâ??å¤?å?¶å?° %s"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
-#: ../mail/em-folder-view.c:1198
-#: ../mail/importers/evolution-mbox-importer.c:82
-msgid "Select folder"
-msgstr "é??æ?©æ??ä»¶å¤¹"
+#: ../mail/em-folder-utils.c:382
+msgid "Move Folder To"
+msgstr "ç§»å?¨æ??ä»¶å¤¹å?°"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
-msgid "C_opy"
-msgstr "å¤?å?¶(_O)"
+#: ../mail/em-folder-utils.c:382
+msgid "Copy Folder To"
+msgstr "å¤?å?¶æ??ä»¶å¤¹å?°"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:495
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "å??å»ºæ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:657
+msgid "Create Folder"
 msgstr "å??å»ºæ??ä»¶å¤¹"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:658
+#: ../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:1087 ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "é?®ä»¶å? é?¤å¤±è´¥"
-
-#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "æ?¨æ²¡æ??è¶³å¤?ç??æ??é??å? é?¤æ¤é?®ä»¶ã??"
-
-#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "å??å¤?å??ä»¶äºº(_R)"
-
-#: ../mail/em-folder-view.c:1328 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "è½¬å??(_F)"
-
-#. 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:1332 ../ui/evolution-mail-message.xml.h:106
-msgid "_Edit as New Message..."
-msgstr "ä½?ä¸ºæ?°ä¿¡ä»¶è¿?è¡?ç¼?è¾?(_E)..."
-
-#: ../mail/em-folder-view.c:1338
-msgid "U_ndelete"
-msgstr "å??æ¶?å? é?¤(_N)"
-
-#: ../mail/em-folder-view.c:1339
-msgid "_Move to Folder..."
-msgstr "ç§»è?³æ??ä»¶å¤¹(_M)..."
-
-#: ../mail/em-folder-view.c:1340
-msgid "_Copy to Folder..."
-msgstr "å¤?å?¶å?°æ??ä»¶å¤¹(_C)..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "Mar_k as Read"
-msgstr "æ ?è®°ä¸ºå·²è¯»(_K)"
-
-#: ../mail/em-folder-view.c:1344
-msgid "Mark as _Unread"
-msgstr "æ ?è®°ä¸ºæ?ªè¯»(_U)"
-
-#: ../mail/em-folder-view.c:1345
-msgid "Mark as _Important"
-msgstr "æ ?è®°ä¸ºé??è¦?(_I)"
-
-#: ../mail/em-folder-view.c:1346
-msgid "Mark as Un_important"
-msgstr "æ ?è®°ä¸ºä¸?é??è¦?(_I)"
-
-#: ../mail/em-folder-view.c:1347
-msgid "Mark as _Junk"
-msgstr "æ ?è®°ä¸ºå??å?¾(_J)"
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mark as _Not Junk"
-msgstr "æ ?è®°ä¸ºé??å??å?¾(_N)"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark for Follo_w Up..."
-msgstr "æ ?è®°ä¸ºè·?é??(_W)..."
-
-#: ../mail/em-folder-view.c:1351
-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:1352 ../widgets/misc/e-dateedit.c:478
-msgid "_None"
-msgstr "æ? (_N)"
-
-#: ../mail/em-folder-view.c:1355
-msgid "_New Label"
-msgstr "æ?°å»ºæ ?ç¾(_N)"
-
-#: ../mail/em-folder-view.c:1359
-msgid "Fla_g Completed"
-msgstr "å·²å®?æ??æ ?å¿?(_G)"
-
-#: ../mail/em-folder-view.c:1360
-msgid "Cl_ear Flag"
-msgstr "æ¸?é?¤æ ?å¿?(_E)"
-
-#: ../mail/em-folder-view.c:1363
-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:1365
-msgid "Search Folder based on _Subject"
-msgstr "å?ºäº?ä¸»é¢?ç??æ??ç´¢æ??ä»¶å¤¹(_S)"
-
-#: ../mail/em-folder-view.c:1366
-msgid "Search Folder based on Se_nder"
-msgstr "å?ºäº?å??ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_N)"
-
-#: ../mail/em-folder-view.c:1367
-msgid "Search Folder based on _Recipients"
-msgstr "å?ºäº?æ?¶ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_R)"
-
-#: ../mail/em-folder-view.c:1368
-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:1373
-msgid "Filter based on Sub_ject"
-msgstr "å?ºäº?ä¸»é¢?è¿?æ»¤(_J)"
-
-#: ../mail/em-folder-view.c:1374
-msgid "Filter based on Sen_der"
-msgstr "å?ºäº?å??ä»¶äººè¿?æ»¤(_D)"
-
-#: ../mail/em-folder-view.c:1375
-msgid "Filter based on Re_cipients"
-msgstr "å?ºäº?æ?¶ä»¶äººè¿?æ»¤(_C)"
-
-#: ../mail/em-folder-view.c:1376
-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:2252 ../mail/em-folder-view.c:2295
-#: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:529
-#: ../plugins/google-account-setup/google-source.c:727
-msgid "Default"
-msgstr "é»?è®¤"
-
-#: ../mail/em-folder-view.c:2513
-msgid "Unable to retrieve message"
-msgstr "æ? æ³?è?·å??ä¿¡ä»¶"
-
-#: ../mail/em-folder-view.c:2532
-msgid "Retrieving Message..."
-msgstr "æ£å?¨æ?¶å??ä¿¡ä»¶..."
-
-#: ../mail/em-folder-view.c:2751
-msgid "C_all To..."
-msgstr "å?¼å?«å?°(_A)..."
-
-#: ../mail/em-folder-view.c:2754
-msgid "Create _Search Folder"
-msgstr "å??å»ºæ??ç´¢æ??ä»¶å¤¹(_S)"
-
-#: ../mail/em-folder-view.c:2755
-msgid "_From this Address"
-msgstr "è?ªæ¤å?°å??(_F)"
-
-#: ../mail/em-folder-view.c:2756
-msgid "_To this Address"
-msgstr "å?°æ¤å?°å??(_T)"
-
-#: ../mail/em-folder-view.c:3249
+#: ../mail/em-folder-utils.c:674
 #, c-format
-msgid "Click to mail %s"
-msgstr "å??å?»ä»¥ç»? %s å??é??é?®ä»¶"
-
-#: ../mail/em-folder-view.c:3261
-#, c-format
-msgid "Click to call %s"
-msgstr "å??å?»ä»¥å?¼å?« %s"
-
-#: ../mail/em-folder-view.c:3266
-msgid "Click to hide/unhide addresses"
-msgstr "å??å?»å?¯é??è??/æ?¾ç¤ºå?°å??"
-
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "å?¹é??ï¼?%d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "æ?¥æ?¾(_D)ï¼?"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "ä¸?ä¸?é¡¹(_P)"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "ä¸?ä¸?é¡¹(_N)"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "å?¹é??å¤§å°?å??(_A)"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "æ? æ³?é??è®¢æ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1536
 msgid "Unsigned"
 msgstr "æ?ªç¾å??"
 
-#: ../mail/em-format-html-display.c:951
+#: ../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:952 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1537
 msgid "Valid signature"
 msgstr "æ??æ??ç¾å??"
 
-#: ../mail/em-format-html-display.c:952
+#: ../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:953 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1538
 msgid "Invalid signature"
 msgstr "æ? æ??ç¾å??"
 
-#: ../mail/em-format-html-display.c:953
+#: ../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:954 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1539
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?å??é??è??"
 
-#: ../mail/em-format-html-display.c:954
+#: ../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:955 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1540
 msgid "Signature exists, but need public key"
 msgstr "ç¾å??å·²å?å?¨ï¼?ä½?é??è¦?å?¬é?¥"
 
-#: ../mail/em-format-html-display.c:955
+#: ../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:962 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1546
 msgid "Unencrypted"
 msgstr "æ?ªå? å¯?"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:114
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "è¿?å°?ä¿¡æ?ªå? å¯?ã??å?¨ Internet ä¸?ä¼ é??æ?¶æ??æ??äººé?½å?¯ä»¥ç??å?°å?¶å??å®¹ã??"
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1547
 msgid "Encrypted, weak"
 msgstr "å¼±å? å¯?"
 
-#: ../mail/em-format-html-display.c:963
+#: ../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 "
@@ -12497,21 +10394,21 @@ msgstr ""
 "è¿?å°?ä¿¡å·²å? å¯?ï¼?ä½?ä½¿ç?¨ç??æ?¯å¼±å? å¯?ç®?æ³?ã??å¦?æ??å¤?äººæ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??å®¹ï¼?å?¯è?½è¦?è?±ä¸?"
 "å®?æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å¾?å?°é?¾ä½?å¹¶ä¸?æ?¯ä¸?å?¯è?½ã??"
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1548
 msgid "Encrypted"
 msgstr "å? å¯?"
 
-#: ../mail/em-format-html-display.c:964
+#: ../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:965 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1549
 msgid "Encrypted, strong"
 msgstr "å¼ºå? å¯?"
 
-#: ../mail/em-format-html-display.c:965
+#: ../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 "
@@ -12520,600 +10417,314 @@ msgstr ""
 "è¿?å°?ä¿¡å·²å? å¯?ï¼?ä¸?ä½¿ç?¨ç??æ?¯å¼ºå? å¯?ç®?æ³?ã??å¦?æ??å¤?äººæ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??å®¹ï¼?å?¯è?½è¦?è?±å¤§"
 "é??æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å??å??å?°é?¾ã??"
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:48
 msgid "_View Certificate"
 msgstr "æ?¥ç??è¯?ä¹¦(_V)"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "æ¤è¯?ä¹¦ä¸?å?¯æ?¥ç??"
 
-#: ../mail/em-format-html-display.c:1407
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%Yå¹´%mæ??%dæ?¥%Aï¼?%p%l:%Må®?æ??"
+#: ../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:730
+msgid "Completed on"
+msgstr "å®?æ??äº?"
 
-#: ../mail/em-format-html-display.c:1415
+#: ../mail/em-format-html-display.c:738
 msgid "Overdue:"
 msgstr "å»¶æ??ï¼?"
 
-#: ../mail/em-format-html-display.c:1418
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "å?° %mæ??%dæ?¥%Aï¼?%p%l:%M"
-
-#: ../mail/em-format-html-display.c:1496
-msgid "_View Inline"
-msgstr "åµ?å?¥è§?å?¾(_V)"
-
-#: ../mail/em-format-html-display.c:1497
-msgid "_Hide"
-msgstr "é??è??(_H)"
-
-#: ../mail/em-format-html-display.c:1498
-msgid "_Fit to Width"
-msgstr "é??å??å®½åº¦(_F)"
-
-#: ../mail/em-format-html-display.c:1499
-msgid "Show _Original Size"
-msgstr "æ?¾ç¤ºå??å§?å¤§å°?(_O)"
-
-#: ../mail/em-format-html-display.c:2168
-msgid "Save attachment as"
-msgstr "é??ä»¶å?¦å?ä¸º"
-
-#: ../mail/em-format-html-display.c:2172
-msgid "Select folder to save all attachments"
-msgstr "é??æ?©ä¿?å?å?¨é?¨é??ä»¶ç??æ??ä»¶å¤¹..."
-
-#: ../mail/em-format-html-display.c:2223
-msgid "_Save Selected..."
-msgstr "ä¿?å?æ??é??(_S)..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2290
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d ä¸ªé??ä»¶(_T)"
-
-#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
-msgid "S_ave"
-msgstr "ä¿?å?(_A)"
-
-#: ../mail/em-format-html-display.c:2308
-msgid "S_ave All"
-msgstr "å?¨é?¨ä¿?å?(_A)"
-
-#: ../mail/em-format-html-display.c:2382
-msgid "No Attachment"
-msgstr "æ? é??ä»¶"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:742
+msgid "by"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
+#: ../mail/em-format-html-display.c:926 ../mail/em-format-html-display.c:965
 msgid "View _Unformatted"
 msgstr "æ? æ ¼å¼?æ?¥ç??(_U)"
 
-#: ../mail/em-format-html-display.c:2531
+#: ../mail/em-format-html-display.c:928
 msgid "Hide _Unformatted"
 msgstr "æ? æ ¼å¼?é??è??(_U)"
 
-#: ../mail/em-format-html-display.c:2588
+#: ../mail/em-format-html-display.c:985
 msgid "O_pen With"
 msgstr "æ??å¼?æ?¹å¼?(_P)"
 
-#: ../mail/em-format-html-display.c:2664
-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:156
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "ç¬¬ %d é¡µï¼?å?± %d é¡µ"
 
-#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
+#: ../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:1387 ../mail/em-format-html.c:1396
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "æ?¶å??â??%sâ??"
 
-#: ../mail/em-format-html.c:925
+#: ../mail/em-format-html.c:1848
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç?? external-body é?¨å??ã??"
 
-#: ../mail/em-format-html.c:933
+#: ../mail/em-format-html.c:1856
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?æ£ç¡®ç?? external-body é?¨å??ã??"
 
-#: ../mail/em-format-html.c:963
+#: ../mail/em-format-html.c:1886
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "æ??å?? FTP ç«?ç?¹ (%s)"
 
-#: ../mail/em-format-html.c:974
+#: ../mail/em-format-html.c:1897
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "å?¨ç«?ç?¹â??%2$sâ??æ??å??æ?¬å?°æ??ä»¶ (%1$s) å??æ³?"
 
-#: ../mail/em-format-html.c:976
+#: ../mail/em-format-html.c:1899
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ??å??æ?¬å?°æ??ä»¶ (%s)"
 
-#: ../mail/em-format-html.c:997
+#: ../mail/em-format-html.c:1920
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "æ??å??è¿?ç¨?æ?°æ?® (%s)"
 
-#: ../mail/em-format-html.c:1008
+#: ../mail/em-format-html.c:1931
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "æ??å??æ?ªç?¥ç??å¤?é?¨æ?°æ?® (â??%sâ??ç±»å??)"
 
-#: ../mail/em-format-html.c:1236
-msgid "Formatting message"
-msgstr "æ ¼å¼?å??ä¿¡ä»¶"
-
-#: ../mail/em-format-html.c:1410
-msgid "Formatting Message..."
-msgstr "æ£å?¨æ ¼å¼?å??ä¿¡ä»¶..."
-
-#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
-msgid "Cc"
-msgstr "æ??é??"
-
-#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
-msgid "Bcc"
-msgstr "å¯?ä»¶æ??é??"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
-msgid "Mailer"
-msgstr "é?®ä»¶ç¨?åº?"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1771
-msgid " (%a, %R %Z)"
-msgstr " (%Aï¼?%R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1776
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. 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:1912
+#: ../mail/em-format-html.c:2589
 #, 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:210 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "å??ä»¶äºº"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:76
-msgid "Reply-To"
-msgstr "å??å¤?è?³"
-
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
-msgid "Date"
-msgstr "æ?¥æ??"
-
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
-msgid "Newsgroups"
-msgstr "æ?°é?»ç»?"
-
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "å¤´å??"
-
-#: ../mail/em-format.c:1158
-#, c-format
-msgid "%s attachment"
-msgstr "%s é??ä»¶"
-
-#: ../mail/em-format.c:1200
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "æ? æ³?è§£æ?? S/MIME ä¿¡ä»¶ï¼?æ?ªç?¥é??è¯¯"
-
-#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "æ? æ³?è§£æ?? MIME ä¿¡ä»¶ã??æ?¾ç¤ºæº?æ??æ?¬ã??"
-
-#: ../mail/em-format.c:1345
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "ä¸?æ?¯æ?? multipart/encrypted ç??å? å¯?ç±»å??"
-
-#: ../mail/em-format.c:1355
-msgid "Could not parse PGP/MIME message"
-msgstr "æ? æ³?è§£æ?? PGP/MIME ä¿¡ä»¶"
-
-#: ../mail/em-format.c:1355
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "æ? æ³?è§£æ?? PGP/MIME ä¿¡ä»¶ï¼?æ?ªç?¥é??è¯¯"
-
-#: ../mail/em-format.c:1512
-msgid "Unsupported signature format"
-msgstr "ä¸?æ?¯æ??ç??ç¾å??æ ¼å¼?"
-
-#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
-msgid "Error verifying signature"
-msgstr "æ ¡éª?ç¾å??é??è¯¯"
-
-#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
-msgid "Unknown error verifying signature"
-msgstr "æ ¡éª?ç¾å??å??ç??äº?æ?ªç?¥é??è¯¯"
-
-#: ../mail/em-format.c:1665
-msgid "Could not parse PGP message"
-msgstr "æ? æ³?å??æ?? PGP ä¿¡ä»¶"
-
-#: ../mail/em-format.c:1665
-msgid "Could not parse PGP message: Unknown error"
-msgstr "æ? æ³?è§£æ?? PGP ä¿¡ä»¶ï¼?æ?ªç?¥é??è¯¯"
-
-#: ../mail/em-mailer-prefs.c:94
-msgid "Every time"
-msgstr "æ¯?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Once per day"
-msgstr "æ¯?å¤©ä¸?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per week"
-msgstr "æ¯?å?¨ä¸?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per month"
-msgstr "æ¯?æ??ä¸?æ¬¡"
-
-#: ../mail/em-mailer-prefs.c:327
-msgid "Add Custom Junk Header"
-msgstr "æ·»å? è?ªå®?ä¹?å??å?¾ä¿¡å¤´"
-
-#: ../mail/em-mailer-prefs.c:331
-msgid "Header Name:"
-msgstr "ä¿¡å¤´å??ç§°ï¼?"
-
-#: ../mail/em-mailer-prefs.c:332
-msgid "Header Value Contains:"
-msgstr "ä¿¡å¤´å?¼å?«æ??ï¼?"
-
-#: ../mail/em-mailer-prefs.c:437
-msgid "Contains Value"
-msgstr "å??å?«å?¼"
-
-#: ../mail/em-mailer-prefs.c:459
-msgid "Color"
-msgstr "é¢?è?²"
-
-#: ../mail/em-mailer-prefs.c:462
-msgid "Tag"
-msgstr "æ ?ç¾"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s æ??ä»¶å?¯ç?¨ï¼?äº?è¿?å?¶æ??ä»¶å·²ç»?å®?è£?ã??"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr "%s æ??ä»¶ä¸?å?¯ç?¨ã??è¯·æ£?æ?¥è½¯ä»¶å??æ?¯å?¦å·²å®?è£?ã??"
-
-#: ../mail/em-mailer-prefs.c:1108
-msgid "No Junk plugin available"
-msgstr "æ²¡æ??å?¯ç?¨ç??å??å?¾é?®ä»¶æ??ä»¶"
-
-#. green
-#: ../mail/em-migrate.c:1059
-msgid "To Do"
-msgstr "å¾?å??"
-
-#. blue
-#: ../mail/em-migrate.c:1060
-msgid "Later"
-msgstr "ç¨?å??"
-
-#: ../mail/em-migrate.c:1652
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "æ? æ³?å??å»ºæ?°æ??ä»¶å¤¹â??%sâ??ï¼?%s"
-
-#: ../mail/em-migrate.c:1678
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "æ? æ³?å°?æ??ä»¶å¤¹â??%sâ??å¤?å?¶ä¸ºâ??%sâ??ï¼?%s"
-
-#: ../mail/em-migrate.c:1863
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "æ? æ³?æ?«æ??ä½?äº?â??%sâ??ç??å·²æ??é?®ç®±ï¼?%s"
-
-#: ../mail/em-migrate.c:1868
-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:2069
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "æ? æ³?æ??å¼?æ?§ç?? POP ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®â??%sâ??ï¼?%s"
-
-#: ../mail/em-migrate.c:2083
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "æ? æ³?å??å»º POP3 ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®ç?®å½?â??%sâ??ï¼?%s"
-
-#: ../mail/em-migrate.c:2112
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "æ? æ³?å¤?å?¶ POP3 å?¨æ??å?¡å?¨ä¸?ä¿?ç??ç??æ?°æ?®â??%sâ??ï¼?%s"
-
-#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "å??å»ºæ?¬å?°é?®ä»¶å?å?¨â??%sâ??å¤±è´¥ï¼?%s"
-
-#: ../mail/em-migrate.c:2952
-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 2.4 ä¹?å??ï¼?Evolution é?®ç®±æ??ä»¶å¤¹ç??æ??è¦?æ ¼å¼?ç?°å·²ç§»è?³ SQLiteã??\n"
-"\n"
-"è¯·ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??ä»¶å¤¹..."
-
-#: ../mail/em-migrate.c:3034
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "æ? æ³?å?¨â??%sâ??å??å»ºæ?¬å?°é?®ä»¶æ??ä»¶å¤¹ï¼?%s"
-
-#: ../mail/em-migrate.c:3053
-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:562 ../mail/em-popup.c:573
-msgid "_Reply to sender"
-msgstr "å??å¤?å??ä»¶äºº(_R)"
-
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Reply to _List"
-msgstr "å??å¤?é?®ä»¶å??è¡¨(_L)"
-
-#. make it first item
-#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
-msgid "_Add to Address Book"
-msgstr "æ·»å? å?°å?°å??ç°¿(_A)"
-
-#: ../mail/em-subscribe-editor.c:600
+#: ../mail/em-subscribe-editor.c:597
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "æ¤å?å?¨ä¸?æ?¯æ??è®¢é??ï¼?æ??è®¢é??æ?ªå?¯ç?¨ã??"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:630
 msgid "Subscribed"
 msgstr "å·²è®¢é??"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:634
 msgid "Folder"
 msgstr "æ??ä»¶å¤¹"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:839
+#: ../mail/em-subscribe-editor.c:846
 msgid "Please select a server."
 msgstr "è¯·é??æ?©æ??å?¡å?¨ã??"
 
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "æ²¡æ??é??ä¸æ??å?¡å?¨"
 
-#. Check buttons
-#: ../mail/em-utils.c:121
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
-msgid "_Do not show this message again."
-msgstr "ä¸?å??æ?¾ç¤ºæ¤ä¿¡æ?¯(_D)ã??"
-
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:341
 msgid "Message Filters"
 msgstr "é?®ä»¶è¿?æ»¤å?¨"
 
-#: ../mail/em-utils.c:370
-msgid "message"
-msgstr "ä¿¡ä»¶"
-
-#: ../mail/em-utils.c:654
-msgid "Save Message..."
-msgstr "ä¿?å?ä¿¡ä»¶..."
-
-#: ../mail/em-utils.c:704
-msgid "Add address"
-msgstr "æ·»å? å?°å??"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1225
+#: ../mail/em-utils.c:845
 #, c-format
 msgid "Messages from %s"
 msgstr "æ?¥è?ª %s ç??ä¿¡ä»¶"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:124
 msgid "Search _Folders"
 msgstr "æ??ç´¢æ??ä»¶å¤¹(_F)"
 
-#: ../mail/em-vfolder-rule.c:593
-msgid "Search Folder source"
-msgstr "æ??ç´¢æ??ä»¶å¤¹æ?¥æº?"
+#: ../mail/em-vfolder-rule.c:521
+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
+#: ../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
+#: ../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
+#: ../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 "è?ªå®?ä¹?ç?¨ä»¥æ£?æ?¥å??å?¾é?®ä»¶ç??ä¿¡å¤´ã??å??è¡¨å??ç´ ç??å?ç¬¦ä¸²æ ¼å¼?ä¸ºâ??ä¿¡å¤´å??=å?¼â??ã??"
 
-#: ../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
+#: ../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
+#: ../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 "
@@ -13124,11 +10735,11 @@ 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
+#: ../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 "
@@ -13137,131 +10748,132 @@ msgstr ""
 "å?³å®?æ?¯å?¦ä½¿ç?¨è?ªå®?ä¹?ä¿¡å¤´æ£?æµ?å??å?¾é?®ä»¶ã??å¦?æ??æ¤é??é¡¹è¢«å?¯ç?¨ä¸?ä¿¡å¤´è¢«è®¾ç½®ç??è¯?ï¼?å°?æ??é«?"
 "å??å?¾é?®ä»¶æ£?æµ?é??åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../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 "é?®ä»¶å??ä½?å?¨ç?¨æ?¥å? è½½/é??å? æ??ä»¶ç??ç?®å½?"
 
-#: ../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
+#, fuzzy
+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
+#: ../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 ""
+
+#: ../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:48
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "å?¯ç?¨æ??ç¦?ç?¨é?æ?¯ç©ºæ ¼é?®"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:58
+#, fuzzy
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "ç¦?ç?¨/å?¯ç?¨å¯¹å¤?å°?é?®ä»¶ç??æ ?è®°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "å?¯ç?¨æ??ç¦?ç?¨è?ªå?¨å??è¿?å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "å?¯ç?¨æ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "å?¯å?¨æ?¶å?¯ç?¨æ??ç´¢æ??ä»¶å¤¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"å?¯ç?¨ä¾§è¾¹æ ?æ??ç´¢ç?¹æ?§ï¼?ä»¥ä¾¿å?¯ä»¥å?¨è¾?å?¥æ??æ?¬ç??å??æ?¶è¿?è¡?äº¤äº?å¼?æ??ç´¢ã??è¿?ä¹?å??ç??ä½?ç?¨å?¨äº?"
-"æ?¨å?¯ä»¥æ?´å? è½»æ?¾å?°å?¨ä¾§è¾¹æ ?ä¸æ?¾å?°æ??ä»¶å¤¹ï¼?å?ªé??è¾?å?¥æ??ä»¶å¤¹å??ç§°ï¼?ç?¶å??é??ä¸è??å?´å°±ä¼?è?ª"
-"å?¨è·³è½¬å?°è¯¥æ??ä»¶å¤¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../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:54
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr "å??è®¸æ¸²æ??è¢«é??å?¶å¤§å°?ç??ä¿¡ä»¶æ??æ?¬é?¨å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "å?¯ç?¨/ç¦?ç?¨å??æ ?æ¨¡å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
-msgstr ""
+msgstr "ä½¿ç?¨ Outlook/Gmail ç??æ?¹å¼?ç¼?ç ?æ??ä»¶å??"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+"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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "ä¿¡ä»¶å??è¡¨é?¢æ?¿ç??é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "ä¿¡ä»¶å??è¡¨é?¢æ?¿ç??é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é??è??å??æ??ä»¶å¤¹é¢?è§?å¹¶ç§»é?¤é??æ?©"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../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 "å¦?æ??ç?¨æ?·è¯?å?¾ä¸?æ¬¡æ??å¼?ç??ä¿¡ä»¶å¤§äº?ç?äº?å??å°?ï¼?å°?ä¼?è¯¢é?®ç?¨æ?·æ?¯å?¦ç??ç??è¦?è¿?ä¹?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr "å¦?æ??å¼?å?¯äº?â??é¢?è§?â??é?¢æ?¿ï¼?å??ä»¥å¹¶å??æ?¹å¼?æ?¾ç¤ºï¼?è??ä¸?æ?¯å??ç?´æ?¹å¼?æ?¾ç¤ºã??"
-
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:72
 #, fuzzy
-#| 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."
 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 "
@@ -13271,13 +10883,41 @@ msgstr ""
 "MIME ç±»å??å?¨ GNOME ç?? MIME ç±»å??æ?°æ?®åº?ä¸æ? å°?ç?? bonobo ç»?ä»¶æ?¥ç??å?¨å°?è¢«ç?¨æ?¥æ?¾ç¤ºå?¶"
 "å??å®¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../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:65
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 "
@@ -13286,23 +10926,25 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-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:68
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
-msgstr "ç¦?ç?¨/å?¯ç?¨å?¨è¿?å?¥ç¦»çº¿æ¨¡å¼?å??ç??æ?¯å?¦é??è¦?ç¦»çº¿å??æ¥ç??ä¸?å??ç??æ??ç¤ºã??"
+"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:69
+#: ../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 "
@@ -13310,31 +10952,36 @@ msgid ""
 msgstr ""
 "ç¦?ç?¨/å?¯ç?¨æ°¸ä¹?å? é?¤(è??é??ç®?å??å?°ä»?ç»?æ??ä¸ç§»é?¤)æ??ç´¢æ??ä»¶å¤¹ä¸ç??ä¿¡ä»¶æ?¶ä¸?æ?å¼¹å?ºç??æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??å?¾é?®ä»¶ç??æ?¶é?´"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??æ?¶ç«?ç??æ?¶é?´"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
+#, fuzzy
+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:74
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "å??å?ºè¦?ä½¿ç?¨ bonobo ç»?ä»¶æ?¥ç??å?¨æ?¥ç??ç?? MIME ç±»å??"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "å??å?ºæ?¥å??ç??è®¸å?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "è´¦æ?·å??è¡¨"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../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."
@@ -13342,15 +10989,15 @@ msgstr ""
 "å??å?ºäº? Evolution é?®ä»¶ç»?ä»¶å·²ç?¥ç??è´¦æ?·ã??æ¤å??è¡¨å??å?«äº?ç?¸å¯¹äº? /apps/evolution/mail/"
 "accounts ç??å?ç?®å½?å?½å??å?ç¬¦ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "è?ªå®?ä¹?å¤´å??è¯¥å¤´æ?¯å?¦å?¯ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../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."
@@ -13358,15 +11005,15 @@ msgstr ""
 "å??å?ºäº? Evolution é?®ä»¶ç»?ä»¶å·²ç?¥ç??æ ?ç¾ã??å??è¡¨ä¸ç??å?ç¬¦ä¸²æ ¼å¼?å½¢å¦?â??å??ç§°:é¢?è?²â??ï¼?å?¶ä¸"
 "é¢?è?²ä½¿ç?¨äº? HTML å??å?è¿?å?¶ç¼?ç ?æ?¹å¼?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "å??å?ºæ?¥å??å??è®®ç??å??è®®å??ç§°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "å?¨ HTML ä¿¡ä»¶ä¸è£?å?¥ HTTP å?¾å??"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../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 "
@@ -13375,246 +11022,360 @@ msgstr ""
 "å?¨ HTML ä¿¡ä»¶ä¸è£?å?¥ HTTP(S) å?¾å??ã??å?¯ä¾?é??æ?©ç??å?¼æ??ï¼?0 - ç»?ä¸?ä»?ç½?ä¸?è£?å?¥å?¾å??ï¼?1 - "
 "å¦?æ??å??é??è??å?¨å?°å??ç°¿ä¸å??è£?å?¥å?¾å??ï¼?2 - æ?»æ?¯ä»?ç½?ä¸?è£?å?¥å?¾å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "è®°å½?è¿?æ»¤å?¨ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "å°?è¿?æ»¤å?¨ä½?è®°å½?å?°æ??å®?æ?¥å¿?æ??ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "è®°å½?è¿?æ»¤å?¨ä½?ç??æ?¥å¿?æ??ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "è®°å½?è¿?æ»¤å?¨ä½?ç??æ?¥å¿?æ??ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../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:89
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "å?¨æ??å®?è¶?æ?¶è¿?å??æ ?ä¸ºå·²ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "å?¨ä¿¡ä»¶â??é¢?è§?â??ä¸æ ?å?ºå¼?ç?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "å?¨ä¿¡ä»¶â??é¢?è§?â??ä¸æ ?å?ºå¼?ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid "Message Window default height"
-msgstr "ä¿¡ä»¶çª?å?£é»?è®¤é«?åº¦"
-
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default width"
-msgstr "ä¿¡ä»¶çª?å?£é»?è®¤å®½åº¦"
-
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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:95
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr "é??å?ºæ?¶æ¸?ç©ºå??å?¾ä¿¡ä»¶ç??æ??å°?å¤©æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
 msgstr "é??å?ºæ?¶æ¸?ç©ºå??æ?¶ç«?ç??æ??å°?å¤©æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../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:98
+#: ../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:99
+#: ../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:100
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "ç©ºä¸»é¢?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../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:102
+#: ../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:103
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "ç?¨æ?·æ?³ç«?å?³ç¦»çº¿æ?¶æ??ç¤ºæ£?æ?¥"
-
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
 msgstr "å? é?¤æ??ç´¢æ??ä»¶å¤¹ä¸ç??ä¿¡ä»¶æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "ç?¨æ?·é??æ¯?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "ç?¨æ?·å?ªå¡«å?¥ Bcc æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "å½?ç?¨æ?·è¯?å?¾ä¸?æ¬¡æ??å¼?è¶?è¿?å??å°?ä¿¡æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../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:109
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "å½?ç?¨æ?·è¯?å?¾å??é??æ²¡æ?? To æ?? Cc æ?¶ä»¶äººç??é?®ä»¶æ?¶æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "å½?ç?¨æ?·æ?¯å?¦å??é??æ??å¤?ç?? HTML æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "æ ?è®°å¤?å°?ä¿¡ä»¶æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
+#, fuzzy
+msgid "Put the cursor at the bottom of replies"
+msgstr "å??å¤?æ?¶å?¨åº?é?¨å¼?å§?æ??å?(_T)"
+
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "è¯?å?«æ??æ?¬ä¸ç??è¡¨æ??ï¼?å¹¶å°?å?¶æ?¿æ?¢ä¸ºå?¾å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "è¯?å?«æ??æ?¬ä¸ç??é?¾æ?¥å¹¶è¿?è¡?æ?¿æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "å¯¹æ?¶å?°ç??é?®ä»¶è¿?è¡?å??å?¾é?®ä»¶æµ?è¯?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "ä¿?å?ç?®å½?"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Search for the sender photo in local address books"
 msgstr "å?¨æ?¬å?°å?°å??è??ä¸æ??ç´¢å??ä»¶äººç?§ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "é»?è®¤ä»¥ HTML å??é??é?®ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "é»?è®¤ä»¥ HTML å??é??é?®ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "å?¨ä¿¡ä»¶å??è¡¨ä¸æ?¾ç¤º email å?°å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "æ??å?¡å?¨å??æ¥é?´é??"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Show \"From\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "å½?å??é??å? å¯?é?®ä»¶æ?¶ä¹?å¯¹è?ªèº«å? å¯?(_F)"
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "æ?¾ç¤ºå?¨ç?»"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:145
+#, fuzzy
+msgid "Show all message headers"
+msgstr "æ??å? å?¨é?¨ä¿¡ä»¶çº¿ç´¢"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+#, fuzzy
+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:123
+#: ../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:124
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨ä¿¡ä»¶å??è¡¨ä¸æ?¾ç¤ºå? é?¤äº?ç??ä¿¡ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Show image animations"
+msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»"
+
+#: ../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:128
+#: ../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: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: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:156
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Show the \"Preview\" pane"
+msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿"
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Show the \"Preview\" pane."
+msgstr "æ?¾ç¤ºâ??é¢?è§?â??é?¢æ?¿ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:159
+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:160
+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:161
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "å?¨ä¿¡ä»¶å??è¡¨ç??ä»¥å?¦å¤?ç??å??æ?¾ç¤ºç?µå?é?®ä»¶ç??å??é??è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:162
+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:163
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨ä¿¡ä»¶é??è¯»é?¢æ?¿ä¸æ?¾ç¤ºå??ä»¶äººç?§ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell check inline"
 msgstr "å??åµ?æ?¼å??æ£?æ?¥"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking color"
 msgstr "æ?¼å??æ£?æ?¥é¢?è?²"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Spell checking languages"
 msgstr "æ?¼å??æ£?æ?¥è¯è¨?"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default height"
 msgstr "è®¢é??å¯¹è¯?æ¡?é»?è®¤é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Subscribe dialog default width"
 msgstr "è®¢é??å¯¹è¯?æ¡?é»?è®¤å®½åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Terminal font"
 msgstr "ç»?ç«¯å?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Text message part limit"
 msgstr "æ??æ?¬ä¿¡ä»¶é?¨å??é??å?¶"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The default plugin for Junk hook"
 msgstr "é»?è®¤ç??å??å?¾ä¿¡ä»¶é?©å?æ??ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??å?¾ä¿¡ä»¶ç??æ?¶é?´ï¼?ä»¥è?ªæ?°çºªå??å??ç??å¤©æ?°æ?¾ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??æ?¶ç«?ç??æ?¶é?´ï¼?ä»¥æ?°çºªå??å??ç??å¤©æ?°æ?¾ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:174
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "The terminal font for mail display."
 msgstr "é?®ä»¶æ?¾ç¤ºç?¨ç??ç»?ç«¯å?ä½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "The variable width font for mail display."
 msgstr "ç?¨äº?æ?¾ç¤ºé?®ä»¶ç??å??å®½å?ä½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:177
 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:143
+#: ../mail/evolution-mail.schemas.in.h:178
 #, fuzzy
-#| 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 interms of KB."
 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."
@@ -13622,7 +11383,7 @@ msgstr ""
 "æ¤é??é¡¹å?³å®?äº? Evolution ä¸å?¯æ ¼å¼?å??ç??æ??å¤§æ??æ?¬é?¨å??å¤§å°?ã??é»?è®¤ä¸º 4MB/4096 KBï¼?å??ä½?"
 "ä¸º KBã??"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:179
 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 "
@@ -13631,7 +11392,7 @@ msgstr ""
 "è¿?æ?¯é»?è®¤ç??å??å?¾é?®ä»¶æ??ä»¶ï¼?å?³ä½¿å?¯ç?¨äº?å¤?ä¸ªæ??ä»¶ã??å¦?æ??é»?è®¤å??å?ºç??æ??ä»¶è¢«ç¦?ç?¨ï¼?å®?ä¸?ä¼?"
 "ç¼ºç??å?°å?¶å®?å?¯ç?¨ç??æ??ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:180
 #, fuzzy
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
@@ -13640,7 +11401,7 @@ msgstr ""
 "æ¤é?®å?ªè¢«è¯»å??ä¸?æ¬¡å¹¶å?¨è¯»å??å??è¢«é??è®¾ä¸º falseã??å®?å??æ¶?é??ä¸å??è¡¨ä¸ç??é?®ä»¶å¹¶ç§»é?¤ç?¸åº?æ??"
 "ä»¶å¤¹ç??é¢?è§?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:181
 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;"
@@ -13650,30 +11411,30 @@ msgstr ""
 "æ¤é?®åº?å??å?«æ??å®?è?ªå®?ä¹?é?®ä»¶å¤´ç?? XML ç»?æ??å??è¡¨ï¼?ä»¥å??æ?¯å?¦æ?¾ç¤ºè¿?äº?é?®ä»¶å¤´ã??XML ç»?æ??ç??"
 "æ ¼å¼?ä¸ºï¼?&lt;å?¯ç?¨ç??é?®ä»¶å¤´&gt; - è®¾ä¸º enabled å??å?¨é?®ä»¶è§?å?¾ä¸æ?¾ç¤ºè¯¥é?®ä»¶å¤´ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:182
 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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "This option would help in improving the speed of fetching."
 msgstr "æ¤é??é¡¹è?½å¸®å?©æ??é«?è?·å??ä¿¡ä»¶ç??é??åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:184
 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:150
+#: ../mail/evolution-mail.schemas.in.h:185
 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:151
+#: ../mail/evolution-mail.schemas.in.h:186
 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 "
@@ -13682,183 +11443,174 @@ msgstr ""
 "æ¤è®¾ç½®æ??å®?äº?é»?è®¤æ??å?µä¸?æ?¯å?¦å°?çº¿ç´¢æ??çº¿ç´¢ä¸ç??æ??æ?°æ¶?æ?¯è??ä¸?æ?¯æ¶?æ?¯æ?¥æ??æ??åº?ã??é??è¦?é??"
 "å?¯ Evolutionã??"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Thread the message list."
 msgstr "æ??çº¿ç´¢ç¼?æ??ä¿¡ä»¶å??è¡¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Thread the message-list"
 msgstr "æ??çº¿ç´¢ç¼?æ??ä¿¡ä»¶å??è¡¨"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Thread the message-list based on Subject"
 msgstr "å?ºäº?ä¸»é¢?æ??çº¿ç´¢ç¼?æ??ä¿¡ä»¶å??è¡¨"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Timeout for marking message as seen"
 msgstr "å°?ä¿¡ä»¶æ ?ä¸ºå·²ç??ç??è¶?æ?¶æ?¶é?¿"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Timeout for marking message as seen."
 msgstr "å°?ä¿¡ä»¶æ ?ä¸ºå·²ç??ç??è¶?æ?¶æ?¶é?¿ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "UID string of the default account."
 msgstr "é»?è®¤è´¦æ?·ç?? UID å?ç¬¦ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use SpamAssassin daemon and client"
 msgstr "ä½¿ç?¨å??å?¾å??æ??å®?æ?¤ç¨?åº?å??å®¢æ?·"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ä½¿ç?¨ SpamAssassin å®?æ?¤ç¨?åº?å??å®¢æ?·ç«¯(spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Use custom fonts"
 msgstr "ä½¿ç?¨è?ªå®?ä¹?å?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Use custom fonts for displaying mail."
 msgstr "ä½¿ç?¨è?ªå®?ä¹?å?ä½?æ?¾ç¤ºé?®ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?®ä»¶æµ?è¯?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ä¹?ä½¿ç?¨æ?¬å?°å??å?¾é?®ä»¶æµ?è¯?(æ?  DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid "Use side-by-side or wide layout"
-msgstr "ä½¿ç?¨å¹¶æ??è¿?æ?¯å®½å±?å¸?å±?"
+#: ../mail/evolution-mail.schemas.in.h:200
+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:166
+#: ../mail/evolution-mail.schemas.in.h:201
+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:202
 msgid "Variable width font"
 msgstr "å??å®½å?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "é??ä¸äº?æ?¥ç??/Bcc è??å??é¡¹"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "é??ä¸äº?æ?¥ç??/Bcc è??å??é¡¹ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "é??ä¸äº?æ?¥ç??/Cc è??å??é¡¹"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "é??ä¸äº?æ?¥ç??/Cc è??å??é¡¹ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "é??ä¸äº?æ?¥ç??/From è??å??é¡¹"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "é??ä¸äº?æ?¥ç??/From è??å??é¡¹ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "é??ä¸äº?æ?¥ç??/PostTo è??å??é¡¹"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "é??ä¸äº?æ?¥ç??/PostTo è??å??é¡¹ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "é??ä¸äº?æ?¥ç??/ReplyTo è??å??é¡¹"
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "é??ä¸äº?æ?¥ç??/ReplyTo è??å??é¡¹ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é»?è®¤å¯¹æ??æ??ä¿¡ä»¶æ·»å? é??è¯»æ?¶æ?¡è¯·æ±?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ç¦?ç?¨æ??å?¯ç?¨ä¾§è¾¹æ ?ä¸æ??ä»¶å¤¹å??ç??ç??ç?¥æ?¾ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:205
 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:180
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦ä»¥çº¿ç´¢ä¸ç??æ??æ?°ä¿¡ä»¶æ?¥æ??åº?çº¿ç´¢"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "Width of the message-list pane"
 msgstr "ä¿¡ä»¶å??è¡¨é?¢æ?¿ç??é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:208
 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:367
+#: ../mail/importers/elm-importer.c:323 ../mail/importers/pine-importer.c:377
+#: ../modules/mail/e-mail-shell-view.c:592
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+msgid "Mail"
+msgstr "é?®ä»¶"
+
+#: ../mail/importers/elm-importer.c:363
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm å¯¼å?¥å?¨"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:364
 msgid "Import mail from Elm."
 msgstr "ä»? Elm å¯¼å?¥é?®ä»¶ã??"
 
-#: ../mail/importers/evolution-mbox-importer.c:79
+#: ../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
+#: ../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:258
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley é?®ç®±(mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:259
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "å¯¼å?¥å?¨ Berkeley é?®ç®±æ ¼å¼?æ??ä»¶å¤¹"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "å¯¼å?¥é?®ç®±"
 
-#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, 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:224
 msgid "Importing Pine data"
 msgstr "å¯¼å?¥ Pine æ?°æ?®"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:382
+#: ../modules/addressbook/addressbook-config.c:986
+msgid "Address Book"
+msgstr "å?°å??ç°¿"
+
+#: ../mail/importers/pine-importer.c:423
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine å¯¼å?¥å?¨"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:424
 msgid "Import mail from Pine."
 msgstr "ä»? Pine å¯¼å?¥é?®ä»¶ã??"
 
@@ -13867,17 +11619,17 @@ msgstr "ä»? Pine å¯¼å?¥é?®ä»¶ã??"
 msgid "Mail to %s"
 msgstr "é?®å¯?ç»? %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "æ?¥è?ª %s ç??é?®ä»¶"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "ä¸»é¢?æ?¯ %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s é?®ä»¶å??è¡¨"
@@ -13886,627 +11638,437 @@ msgstr "%s é?®ä»¶å??è¡¨"
 msgid "Add Filter Rule"
 msgstr "æ·»å? è¿?æ»¤è§?å??"
 
-#: ../mail/mail-component.c:550
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "å·²é??ä¸ %d ä¸ªï¼?"
-
-#: ../mail/mail-component.c:554
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d å°?å·²å? é?¤"
-
-#: ../mail/mail-component.c:561
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d å°?å??å?¾"
-
-#: ../mail/mail-component.c:564
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d å°?è??ç¨¿"
-
-#: ../mail/mail-component.c:566
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d å°?å·²å??"
-
-#: ../mail/mail-component.c:568
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d å°?æ?ªå??"
-
-#: ../mail/mail-component.c:574
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "ï¼?%d å°?æ?ªè¯»ï¼?"
-
-#: ../mail/mail-component.c:575
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "æ?»å?± %d å°?"
-
-#: ../mail/mail-component.c:927
-msgid "New Mail Message"
-msgstr "æ?°å»ºä¿¡ä»¶"
-
-#: ../mail/mail-component.c:928
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "ä¿¡ä»¶(_M)"
-
-#: ../mail/mail-component.c:929
-msgid "Compose a new mail message"
-msgstr "æ?°å??ä¸?å°?æ?°ä¿¡"
-
-#: ../mail/mail-component.c:935
-msgid "New Mail Folder"
-msgstr "æ?°å»ºé?®ä»¶æ??ä»¶å¤¹"
-
-#: ../mail/mail-component.c:936
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "é?®ä»¶æ??ä»¶å¤¹(_F)"
-
-#: ../mail/mail-component.c:937
-msgid "Create a new mail folder"
-msgstr "å??å»ºæ?°é?®ä»¶æ??ä»¶å¤¹"
-
-#: ../mail/mail-component.c:1084
-msgid "Failed upgrading Mail settings or folders."
-msgstr "å??çº§é?®ä»¶è®¾ç½®æ??æ??ä»¶å¤¹å¤±è´¥ã??"
-
-#: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr "æ£?æ?¥æ?¯æ??ç??ç±»å??(_E)"
-
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(æ³¨æ??ï¼?é??è¦?é??å?¯åº?ç?¨ç¨?åº?)"
 
-#: ../mail/mail-config.glade.h:4
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>(å?¨æ¤ç??æ?¬ç?? Evolution ä¸ä¸?æ?¯æ?? SSL)</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>å??é??è??ç?§ç??</b>"
-
-#: ../mail/mail-config.glade.h:6
-msgid "<b>Sig_natures</b>"
-msgstr "<b>ç¾å??(_N)</b>"
-
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Top Posting é??é¡¹</b> (ä¸?æ?¨è??)"
 
-#: ../mail/mail-config.glade.h:8
-msgid "<b>_Languages</b>"
-msgstr "<b>è¯è¨?(_L)</b>"
-
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">è´¦æ?·ä¿¡æ?¯</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">èº«ä»½éª?è¯?</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">æ?°å??ä¿¡ä»¶</span>"
-
-#: ../mail/mail-config.glade.h:13
-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\">Pretty Good Privacy (PGP/GPG)</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.ui.h:3
+msgid "Account Information"
+msgstr "å¸?æ?·ä¿¡æ?¯"
 
-#: ../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 "æ?»æ?¯æ??é??å?°(_S)ï¼?"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "æ?»æ?¯æ??é??å?°(_B)ï¼?"
 
-#: ../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:46
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "èº«ä»½éª?è¯?"
+
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "è?ªå?¨æ??å?¥è¡¨æ??å?¾å??(_E)"
 
-#: ../mail/mail-config.glade.h:47
-msgid "Baltic (ISO-8859-13)"
-msgstr "æ³¢ç½?ç??è¯(ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:48
-msgid "Baltic (ISO-8859-4)"
-msgstr "æ³¢ç½?ç??è¯(ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "å?ç¬¦é??(_H)ï¼?"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
+#: ../mail/mail-config.ui.h:17
+msgid "Ch_eck for Supported Types"
 msgstr "æ£?æ?¥æ?¯æ??ç??ç±»å??(_E)"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "æ£?æ?¥è?ªå®?ä¹?ä¿¡å¤´ä»¥å?¤å?«å??å?¾é?®ä»¶(_S)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "æ£?æ?¥æ?¶å?°ç??é?®ä»¶æ?¯å?¦æ?¯å??å?¾é?®ä»¶(_M)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "å?¨æ??è¾?å?¥æ?¶è¿?è¡?æ?¼å??æ£?æ?¥(_T)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "æ£?æ?¥æ?¶å?°ç??ä¿¡ä»¶æ?¯å?¦æ?¯å??å?¾é?®ä»¶"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "æ¸?é?¤(_A)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "æ¸?é?¤(_R)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "ç»?é??è¯¯æ?¼å??ç??å??è¯?ç??è?²(_M)ï¼?"
 
-#: ../mail/mail-config.glade.h:58
+#: ../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:59
-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"
-"å??å?»â??åº?ç?¨â??å?¯ä¿?å?æ?¨ç??è®¾ç½®ã??"
-
-#: ../mail/mail-config.glade.h:65
-msgid "De_fault"
-msgstr "é»?è®¤(_F)"
+#: ../mail/mail-config.ui.h:29
+msgid "Default Behavior"
+msgstr "é»?è®¤è¡?ä¸º"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "é»?è®¤å?ç¬¦ç¼?ç ?(_N)ï¼?"
 
-#: ../mail/mail-config.glade.h:68
+#: ../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:70
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "å¯¹å¯?å?ºç??ä¿¡ä»¶è¿?è¡?æ?°å?ç¾å??(é»?è®¤)(_U)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../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:72
+#: ../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:73
+#: ../mail/mail-config.ui.h:39
 msgid "Do not quote"
 msgstr "ä¸?å¼?ç?¨"
 
-#: ../mail/mail-config.glade.h:74
-msgid "Done"
-msgstr "å®?æ??"
-
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "è??ç¨¿æ??ä»¶å¤¹(_F)ï¼?"
 
-#: ../mail/mail-config.glade.h:76
-msgid "Email Accounts"
-msgstr "ç?µå?é?®ä»¶"
-
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "ç?µå?é?®ä»¶å?°å??(_A)ï¼?"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "é??å?ºæ?¶æ¸?ç©ºå·²å? é?¤é?®ä»¶(_X)"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "å?¯ç?¨é?æ?¯ç©ºæ ¼é?®(_P)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "å?¯ç?¨æ??ç´¢æ??ä»¶å¤¹(_R)"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "å? å¯?è¯?ä¹¦(_P)ï¼?"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¯?å?ºç??ä¿¡ä»¶(é»?è®¤)(_G)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "ç?å®½(_X)ï¼?"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "ç?å®½å?ä½?(_E)ï¼?"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "å?ä½?å±?æ?§"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "ç?¨ HTML æ ¼å¼?å??ä¿¡ä»¶(_H)"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E)ï¼?"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML ä¿¡ä»¶"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "HTTP ä»£ç??æ??å?¡å?¨(_T)ï¼?"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "ä¿¡å¤´"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "çª?å?ºæ?¾ç¤ºå¼?ç?¨(_Q)"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:59
 msgid "Inline"
 msgstr "åµ?å?¥"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:60
 msgid "Inline (Outlook style)"
 msgstr "åµ?å?¥(Outlook é£?æ ¼)"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../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:101
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "è¯è¨?è¡¨"
 
-#: ../mail/mail-config.glade.h:102
-msgid "Mail Configuration"
-msgstr "é?®ä»¶é??ç½®"
+#: ../mail/mail-config.ui.h:65
+msgid "Loading Images"
+msgstr "è£?å?¥å?¾å??"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "é?®ä»¶å¤´è¡¨"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "é?®ä»¶ç®±ä½?ç½®"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Message Composer"
-msgstr "ä¿¡ä»¶æ?°å??å?¨"
+#: ../mail/mail-config.ui.h:68
+msgid "Message Display"
+msgstr "ä¿¡ä»¶æ?¾ç¤º"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.ui.h:69
+msgid "Message Fonts"
+msgstr "ä¿¡ä»¶å?ä½?"
+
+#: ../mail/mail-config.ui.h:70
+#, fuzzy
+msgid "Message Receipts"
+msgstr "ä¿¡ä»¶ç?¶æ??"
+
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "ä¸?ä½¿ç?¨ä»£ç??ç??æ??å?µ(_P)ï¼?"
 
-#: ../mail/mail-config.glade.h:108
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr "æ³¨æ??ï¼?æ ?ç¾å??ä¸ç??ä¸?å??çº¿è¢«ç?¨ä½?è??å??ä¸ç??å?©è®°ç¬¦ã??"
-
-#: ../mail/mail-config.glade.h:109
+#: ../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:110
+#: ../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:111
+#: ../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:112
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG é?®æ ?è¯?(_K)ï¼?"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "å¯?ç ?(_W)ï¼?"
 
-#: ../mail/mail-config.glade.h:115
-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/mail-config.glade.h:117
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"è¯·å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å??ä»¶æ??å?¡å?¨ä¿¡æ?¯ã??å¦?æ??æ?¨ä¸?å¤ªç¡®å®?ç??è¯?ï¼?è¯·è¯¢é?®æ?¨ç??ç³»ç»?ç®¡ç??å??æ??è??"
-"äº?è??ç½?æ??å?¡æ??ä¾?å??ISPã??"
-
-#: ../mail/mail-config.glade.h:118
-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:119
-msgid "Please select among the following options"
-msgstr "è¯·ä»?ä»¥ä¸?é??é¡¹ä¸é??æ?©"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "ç«¯å?£ï¼?"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "å??é??å?ªæ??æ??é??æ?¶ä»¶äººç??ä¿¡ä»¶æ?¶æ??ç¤º(_O)"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.ui.h:83
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+
+#: ../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.glade.h:123
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "è®°ä½?å¯?ç ?(_M)"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "å??å¤?å?°(_P)ï¼?"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "è®°ä½?å¯?ç ?(_P)"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "SOCKS ä¸»æ?º(_O)ï¼?"
+#: ../mail/mail-config.ui.h:92
+msgid "Required Information"
+msgstr "é??è¦?ç??ä¿¡æ?¯"
+
+#: ../mail/mail-config.ui.h:94
+#, fuzzy
+msgid "SSL is not supported in this build of Evolution"
+msgstr "<b>(å?¨æ¤ç??æ?¬ç?? Evolution ä¸ä¸?æ?¯æ?? SSL)</b>"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ä»?å?¨æ?¬å?°å?°å??ç°¿ä¸æ??ç´¢å??ä»¶äººç?§ç??(_E)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "é??æ?©(_E)..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "å??é??ä¿¡ä»¶æ?¶æ?¡(_E)ï¼?"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
 msgstr "æ ?å??å?ä½?(_T)ï¼?"
 
-#: ../mail/mail-config.glade.h:133
+#: ../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.glade.h:134
+#: ../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:138
+#: ../mail/mail-config.ui.h:106
 msgid "Select Sent Folder"
 msgstr "é??æ?©å·²å??æ??ä»¶å¤¹"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+msgid "Sender Photograph"
+msgstr "<b>å??é??è??ç?§ç??</b>"
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "å??é??é?®ä»¶"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "å·²å??é??ä¿¡ä»¶æ??ä»¶å¤¹(_M)ï¼?"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:110
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "å·²å??ä¿¡ä»¶"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "æ??å?¡å?¨é??è¦?è®¤è¯?(_V)"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
+#: ../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:144
+#: ../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:145
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "ç¾å??(_U)ï¼?"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
 msgstr "ç¾å??"
 
-#: ../mail/mail-config.glade.h:147
-msgid "Signatures Table"
-msgstr "ç¾å??è¡¨"
-
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "æ?¼å??æ£?æ?¥"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "å??å¤?æ?¶å?¨åº?é?¨å¼?å§?æ??å?(_T)"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
+#: ../mail/mail-config.ui.h:121
+msgid "T_ype:"
 msgstr "ç±»å??(_Y)ï¼?"
 
-#: ../mail/mail-config.glade.h:151
+#: ../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:152
+#: ../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\n"
@@ -14515,7 +12077,7 @@ msgstr ""
 "æ¤è??æ?¬ç??è¾?å?ºå°?ç?¨äº?æ?¨ç??ç¾å??ã??æ?¨æ??å®?ç??å??ç§°å°?å?ªä¼?\n"
 "ç?¨äº?æ?¾ç¤ºã??"
 
-#: ../mail/mail-config.glade.h:155
+#: ../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\""
@@ -14523,229 +12085,246 @@ msgstr ""
 "è¾?å?¥æ?¨æ?³è¦?ç»?æ¤å¸?æ?·èµ·ç??å??å?ã??\n"
 "å¦?ï¼?â??å·¥ä½?â??æ??â??ç§?äººâ??"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "ç?¨æ?·å??(_E)ï¼?"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "ä½¿ç?¨èº«ä»½éª?è¯?(_N)"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:634
-#: ../plugins/google-account-setup/google-contacts-source.c:288
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:405
+#: ../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:160
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "å??å®½(_A)ï¼?"
 
-#: ../mail/mail-config.glade.h:161
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
-msgstr ""
-"æ¬¢è¿?ä½¿ç?¨ Evolution é?®ä»¶é??ç½®å?©æ??ã??\n"
-"\n"
-"å??å?»â??å??è¿?â??å¼?å§?ã??"
-
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "æ·»å? ç¾å??(_A)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
 msgstr "æ?»æ?¯ä»? Internet ä¸?è£?å?¥å?¾å??(_A)"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "è?ªå?¨ä»£ç??æ??å?¡å?¨é??ç½® URL(_A)ï¼?"
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "èº«ä»½éª?è¯?ç±»å??(_A)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
 msgstr "é»?è®¤ç??å??å?¾é?®ä»¶æ??ä»¶(_D)ï¼?"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "ç?´æ?¥è¿?æ?¥å?° Internet(_D)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?è¦?ç¾å??ä¼?è®®è¯·æ±?(å?? Outlook å?¼å®¹)(_D)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "è½¬å??æ?¹å¼?(_F)ï¼?"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "å??å¤?æ?¶ä¿?ç??å??å§?ä¿¡ä»¶ç??ç¾å??(_K)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../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:174
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "ä»?å?¨æ?¬å?°å?°å??ç°¿ä¸æ?¥é??(_L)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
 msgstr "ä½¿å®?æ??ä¸ºæ??ç??é»?è®¤è´¦æ?·(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "æ??å?¨ä»£ç??æ??å?¡å?¨é??ç½®(_M)ï¼?"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "æ??ä¿¡ä»¶æ ?è®°ä¸ºå·²è¯»å??ç?(_M)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
 msgstr "ç»?ä¸?ä»? Internet è£?å?¥å?¾å??(_N)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "è·¯å¾?(_P)ï¼?"
 
-#: ../mail/mail-config.glade.h:181
+#: ../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:182
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "å??é??ç©ºä¸»é¢?è¡?ç??ä¿¡ä»¶æ?¶æ??ç¤º(_P)"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "å??å¤?é£?æ ¼(_R)ï¼?"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "è??æ?¬(_S)ï¼?"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??(_S)ï¼?"
 
-#: ../mail/mail-config.glade.h:186
-msgid "_Select..."
-msgstr "é??æ?©(_S)..."
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:28
+#: ../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:189
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»(_S)"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨ç?µå?é?®ä»¶é¢?è§?ä¸æ?¾ç¤ºå??é??è??ç??ç?§ç??(_S)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "å?ªæ?¾ç¤º To/Cc/Bcc å¤´ä¸ç??å??(_S)"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "ä½¿ç?¨å®?å?¨è¿?æ?¥(_U)ï¼?"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "ä½¿ç?¨é»?è®¤å?¼(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "ä½¿ç?¨ä¸?å?¶å®?åº?ç?¨ç¨?åº?ç?¸å??ç??å?ä½?(_U)"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:49
+#, fuzzy
+msgid "a"
+msgstr "ä¸?å??"
+
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "ä¸ªå?°å??"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:50
+msgid "b"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:166
 msgid "color"
 msgstr "é¢?è?²"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 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
-msgid "Case _sensitive"
-msgstr "å?ºå??å¤§å°?å??(_S)"
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "å?¼å?«"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "å·²å®?æ??(_M)"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "æ?¥æ?¾(_I)ï¼?"
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "æ?°å?ç¾å??"
 
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "å?¨ä¿¡ä»¶ä¸æ?¥æ?¾"
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "ä¸?è¦?è½¬å??"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
-msgid "Flag to Follow Up"
-msgstr "è·?é??ç??æ ?å¿?"
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "å? å¯?"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "æ??ä»¶å¤¹è®¢é??"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../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:15
-msgid "None Selected"
-msgstr "æ²¡æ??é??ä¸"
+#: ../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.glade.h:16
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
 msgstr "æ??å?¡å?¨(_E)ï¼?"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:22
+#, fuzzy
+msgid "Search Folder Sources"
+msgstr "æ??ç´¢æ??ä»¶å¤¹æ?¥æº?"
+
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "å®?å?¨ä¿¡æ?¯"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "æ??å®?æ??ä»¶å¤¹"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../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."
@@ -14753,42 +12332,42 @@ msgstr ""
 "æ?¨é??ä¸è¿?è¡?è·?é??ç??ä¿¡ä»¶å·²ç»?å?¨ä¸?é?¢å??å?ºã??\n"
 "è¯·ä»?â??æ ?å¿?â??è??å??ä¸é??æ?©è·?é??æ??ä½?ã??"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "æ?¥å??å??è®®(_A)"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "å»¶æ??äºº(_D)ï¼?"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
 msgstr "æ ?å¿?(_F)ï¼?"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../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:890
 #, c-format
 msgid "Pinging %s"
 msgstr "æ?¥éª? %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:110
 msgid "Filtering Selected Messages"
 msgstr "è¿?æ»¤é??ä¸ç??ä¿¡ä»¶"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:269
 msgid "Fetching Mail"
 msgstr "æ?¶å??é?®ä»¶"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:600
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "åº?ç?¨å¯?å?ºè¿?æ»¤å?¨å¤±è´¥ï¼?%s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:612 ../mail/mail-ops.c:639
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14797,121 +12376,129 @@ msgstr ""
 "è¿½å? å?° %sï¼?%s å¤±è´¥\n"
 "è½¬è??è¿½å? å?°æ?¬å?°â??å·²å??â??æ??ä»¶å¤¹ã??"
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:656
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "è¿½å? å?°æ?¬å?°â??å·²å??â??æ??ä»¶å¤¹å¤±è´¥ï¼?%s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:767 ../mail/mail-ops.c:848
 msgid "Sending message"
 msgstr "å??é??ä¿¡ä»¶"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:777
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "å??é??ç¬¬%då°?ä¿¡ï¼?å?±%då°?"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:804
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "å?¨ç¬¬%då°?ä¿¡å¤±è´¥ï¼?å?±%då°?"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:806 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:808 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:872
-msgid "Saving message to folder"
+#: ../mail/mail-ops.c:920
+#, fuzzy, c-format
+msgid "Saving message to folder '%s'"
 msgstr "æ??ä¿¡ä»¶ä¿?å?å?°æ??ä»¶å¤¹ä¸"
 
-#: ../mail/mail-ops.c:950
-#, c-format
-msgid "Moving messages to %s"
+#: ../mail/mail-ops.c:997
+#, fuzzy, c-format
+msgid "Moving messages to '%s'"
 msgstr "æ??ä¿¡ä»¶ç§»è?³ %s"
 
-#: ../mail/mail-ops.c:950
-#, c-format
-msgid "Copying messages to %s"
+#: ../mail/mail-ops.c:997
+#, fuzzy, c-format
+msgid "Copying messages to '%s'"
 msgstr "æ??ä¿¡ä»¶å¤?å?¶å?° %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1106
+#, fuzzy, c-format
+msgid "Scanning folders in '%s'"
+msgstr "å?¨â??%sâ??ä¸æ?«æ??æ??ä»¶å¤¹"
+
+#: ../mail/mail-ops.c:1214
 msgid "Forwarded messages"
 msgstr "è½¬å??ç??ä¿¡ä»¶"
 
-#: ../mail/mail-ops.c:1208
-#, c-format
-msgid "Opening folder %s"
+#: ../mail/mail-ops.c:1255
+#, fuzzy, c-format
+msgid "Opening folder '%s'"
 msgstr "æ??å¼?æ??ä»¶å¤¹ %s"
 
-#: ../mail/mail-ops.c:1273
-#, c-format
-msgid "Retrieving quota information for folder %s"
+#: ../mail/mail-ops.c:1321
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder '%s'"
 msgstr "æ£å?¨è?·å??æ??ä»¶å?  %s ç??é??é¢?ä¿¡æ?¯"
 
-#: ../mail/mail-ops.c:1342
-#, c-format
-msgid "Opening store %s"
+#: ../mail/mail-ops.c:1393
+#, fuzzy, c-format
+msgid "Opening store '%s'"
 msgstr "æ??å¼?å?å?¨ %s"
 
-#: ../mail/mail-ops.c:1413
-#, c-format
-msgid "Removing folder %s"
+#: ../mail/mail-ops.c:1464
+#, fuzzy, c-format
+msgid "Removing folder '%s'"
 msgstr "å? é?¤æ??ä»¶å¤¹ %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1582
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "å?å?¨æ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1645
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "é??æ¯?å¹¶å?å?¨è´¦æ?·â??%sâ??"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1646
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?å?¨è´¦æ?·â??%sâ??"
 
-#: ../mail/mail-ops.c:1649
-msgid "Refreshing folder"
+#: ../mail/mail-ops.c:1700
+#, fuzzy, c-format
+msgid "Refreshing folder '%s'"
 msgstr "å?·æ?°æ??ä»¶å¤¹"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
-msgid "Expunging folder"
+#: ../mail/mail-ops.c:1740
+#, fuzzy, c-format
+msgid "Expunging folder '%s'"
 msgstr "é??æ¯?æ??ä»¶å¤¹"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1785
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?ç©ºâ??%sâ??ä¸ç??å??æ?¶ç«?"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1786
 msgid "Local Folders"
 msgstr "æ?¬å?°æ??ä»¶å¤¹"
 
-#: ../mail/mail-ops.c:1818
-#, c-format
-msgid "Retrieving message %s"
+#: ../mail/mail-ops.c:1864
+#, fuzzy, c-format
+msgid "Retrieving message '%s'"
 msgstr "æ?¶å??ä¿¡ä»¶ %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1982
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "æ?¶å?? %d å°?ä¿¡"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2071
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ä¿?å? %d å°?ä¿¡"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2151
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14920,11 +12507,11 @@ msgstr ""
 "å?¨å°?ä¿¡ä»¶ä¿?å?å?° %s æ?¶å??ç??é??è¯¯ï¼?\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2223
 msgid "Saving attachment"
 msgstr "ä¿?å?é??ä»¶"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2241 ../mail/mail-ops.c:2249
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14933,134 +12520,121 @@ msgstr ""
 "æ? æ³?å??å»ºè¾?å?ºæ??ä»¶ï¼?%sï¼?\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2264
 #, c-format
 msgid "Could not write data: %s"
 msgstr "æ? æ³?å??æ?°æ?®ï¼?%s"
 
-#: ../mail/mail-ops.c:2347
-#, c-format
-msgid "Disconnecting from %s"
+#: ../mail/mail-ops.c:2409
+#, fuzzy, c-format
+msgid "Disconnecting from '%s'"
 msgstr "æ?å¼?ä¸? %s ç??è¿?æ?¥"
 
-#: ../mail/mail-ops.c:2347
-#, c-format
-msgid "Reconnecting to %s"
+#: ../mail/mail-ops.c:2409
+#, fuzzy, c-format
+msgid "Reconnecting to '%s'"
 msgstr "é??æ?°è¿?æ?¥å?° %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2505
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æ£å?¨å??å¤?è?±æ?ºä½¿ç?¨è´¦æ?·â??%sâ??"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2591
 msgid "Checking Service"
 msgstr "æ£?æ?¥æ??å?¡"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "æ£å?¨å??æ¶?..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:432
 msgid "Send & Receive Mail"
 msgstr "å??é??å??æ?¥æ?¶é?®ä»¶"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:445
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "æ£å?¨æ?´æ?°..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "æ£å?¨ç?å¾?..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "æ£?æ?¥æ?°é?®ä»¶"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è¾?å?¥ %s ç??å¯?ç ?"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:216
 msgid "Enter Passphrase"
 msgstr "è¾?å?¥å¯?ç ?"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:219
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ä¸º %s è¾?å?¥å¯?ç ?"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:221
 msgid "Enter Password"
 msgstr "è¾?å?¥å¯?ç ?"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:263
 msgid "User canceled operation."
 msgstr "ç?¨æ?·å·±å??æ¶?æ??ä½?ã??"
 
-#: ../mail/mail-signature-editor.c:201
-msgid "_Save and Close"
-msgstr "ä¿?å?å¹¶å?³é?(_S)"
-
-#: ../mail/mail-signature-editor.c:355
-msgid "Edit Signature"
-msgstr "ç¼?è¾?ç¾å??"
-
-#: ../mail/mail-signature-editor.c:370
-msgid "_Signature Name:"
-msgstr "ç¾å??(_S)ï¼?"
-
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:136
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "æ? æ³?å??å»ºè?±æ?ºç?®å½?â??%sâ??ï¼?%s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:166
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "è¯?å?¾å°?é?®ä»¶ç§»è?³é?? mbox æº?â??%sâ??"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:272
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "è½¬å??ç??ä¿¡ä»¶ - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:274
 msgid "Forwarded message"
 msgstr "è½¬å??ç??ä¿¡ä»¶"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:314
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "æ? æ??ç??æ??ä»¶å¤¹ï¼?â??%sâ??"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "è®¾ç½®æ??ç´¢æ??ä»¶å¤¹ï¼?%s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?°â??%s:%sâ??ç??æ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?°â??%sâ??ç??æ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1075
 msgid "Edit Search Folder"
 msgstr "ç¼?è¾?æ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1168
 msgid "New Search Folder"
 msgstr "æ?°å»ºæ??ç´¢æ??ä»¶å¤¹"
 
@@ -15135,74 +12709,84 @@ 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 only BCC recipients?"
+#, fuzzy
+msgid "Are you sure you want to send a message with invalid address?"
 msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å??é??å?ªæ??å¯?ä»¶æ??é??æ?¶ä»¶äººç??ä¿¡ä»¶å??ï¼?"
 
 #: ../mail/mail.error.xml.h:17
+#, fuzzy
+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: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 "æ? æ³?æ??å¼?æº?â??{0}â??"
 
-#: ../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
+#: ../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."
@@ -15210,35 +12794,35 @@ 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 "æ£?æ?¥å??å?¾ä¿¡å¤±è´¥"
 
-#: ../mail/mail.error.xml.h:42
+#: ../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."
@@ -15246,123 +12830,111 @@ 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
+#: ../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
+#: ../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."
 msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?è´¦æ?·ä¿¡æ?¯å??å?¶å?¨é?¨ä»£ç??æ??å?¡å?¨ä¿¡æ?¯å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../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
+#: ../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
+#: ../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 "
@@ -15373,31 +12945,27 @@ msgstr ""
 "ä¸ªé?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??ä¿¡ä»¶ä¸å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??ä¸ºäº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?è¯¥è?³å°?å¡«å?¥"
 "ä¸?ä¸ª To: æ?? CC: æ?¶ä»¶äººã??"
 
-#: ../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
+#: ../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."
@@ -15405,7 +12973,7 @@ msgstr ""
 "è¯·å?¨ To: ä¸è¾?å?¥æ??æ??ç??ç?µå?é?®ä»¶å?°å??ã??æ?¨å?¯ä»¥å??å?»è¾?å?¥æ¡?æ??è¾¹ç?? To: æ??é?®æ?¥æ??ç´¢ç?µå?"
 "é?®ä»¶å?°å??ã??"
 
-#: ../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"
@@ -15414,69 +12982,65 @@ 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
+#: ../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"
@@ -15491,7 +13055,7 @@ msgstr ""
 "ä¸ªé?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??ä¿¡ä»¶ä¸å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??ä¸ºäº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?è¯¥è?³å°?å¡«å?¥"
 "ä¸?ä¸ª To: æ?? CC: æ?¶ä»¶äººã??"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15505,7 +13069,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"
@@ -15519,6 +13083,18 @@ msgstr ""
 "   â??{1}â??\n"
 "å·²ç»?æ?´æ?°ã??"
 
+#: ../mail/mail.error.xml.h:107
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "è??æ?¬æ??ä»¶å¿?é¡»å?å?¨ä¸?å?¯æ?§è¡?ã??"
@@ -15589,6 +13165,10 @@ 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 "æ?¨æ²¡æ??å¡«å?¥æ??é??ç??å?¨é?¨ä¿¡æ?¯ã??"
@@ -15634,6 +13214,11 @@ msgstr "ä¸¢å¼?æ?´æ?¹(_D)"
 msgid "_Do not Synchronize"
 msgstr "ä¸?å??æ¥(_D)"
 
+#: ../mail/mail.error.xml.h:138
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
+msgid "_Empty Trash"
+msgstr "æ¸?ç©ºå??æ?¶ç«?(_E)"
+
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "é??æ¯?(_E)"
@@ -15642,85 +13227,94 @@ msgstr "é??æ¯?(_E)"
 msgid "_Open Messages"
 msgstr "æ??å¼?ä¿¡ä»¶(_O)"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1068
 msgid "Unseen"
 msgstr "æ?ªç??"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1069
 msgid "Seen"
 msgstr "å·²ç??"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1070
 msgid "Answered"
 msgstr "å·²ç?å¤?"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1071
 msgid "Forwarded"
 msgstr "å·²è½¬å??"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1072
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å°?æ?ªç??ä¿¡ä»¶"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1073
 msgid "Multiple Messages"
 msgstr "å¤?å°?ä¿¡"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1077
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1078
 msgid "Lower"
 msgstr "è¾?ä½?"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1082
 msgid "Higher"
 msgstr "è¾?é«?"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1083
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1712 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:70
+#: ../mail/message-list.c:1719 ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M %p"
 msgstr "ä»?å¤©%p%l:%M"
 
-#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1728
 msgid "Yesterday %l:%M %p"
 msgstr "æ?¨å¤©%p%l:%M"
 
-#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1740
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1748
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p%l:%M"
 
-#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1750
 msgid "%b %d %Y"
 msgstr "%Yå¹´%mæ??%dæ?¥"
 
+#: ../mail/message-list.c:2510 ../shell/e-shell-view.c:535
+msgid "Shell Backend"
+msgstr ""
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
+#: ../mail/message-list.c:4263 ../mail/message-list.c:4743
 msgid "Generating message list"
 msgstr "ç??æ??ä¿¡ä»¶å??è¡¨"
 
-#: ../mail/message-list.c:4288
+#: ../mail/message-list.c:4578
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4290
+#: ../mail/message-list.c:4580
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr ""
+
+#: ../mail/message-list.c:4582
 msgid "There are no messages in this folder."
 msgstr "æ¤æ??ä»¶å¤¹ä¸æ²¡æ??ä¿¡ä»¶ã??"
 
@@ -15749,7 +13343,7 @@ 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 "å¤§å°?"
 
@@ -15757,77 +13351,2232 @@ msgstr "å¤§å°?"
 msgid "Subject - Trimmed"
 msgstr "ä¸»é¢? - è¢«æ?ªæ?"
 
-#: ../mail/message-tag-followup.c:55
-msgid "Call"
-msgstr "å?¼å?«"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Do Not Forward"
-msgstr "ä¸?è¦?è½¬å??"
-
-#: ../mail/message-tag-followup.c:57
-msgid "Follow-Up"
-msgstr "è·?é??"
-
-#: ../mail/message-tag-followup.c:58
-msgid "For Your Information"
-msgstr "ç»?æ?¨ç??ä¿¡æ?¯"
-
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "è½¬å??"
-
-#: ../mail/message-tag-followup.c:60
-msgid "No Response Necessary"
-msgstr "ä¸?å¿?å??å¤?"
-
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
-msgid "Reply"
-msgstr "å??å¤?"
-
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
-msgid "Reply to All"
-msgstr "å?¨é?¨å??å¤?"
-
-#: ../mail/message-tag-followup.c:65
-msgid "Review"
-msgstr "å??é¡¾"
-
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1418
 msgid "Body contains"
 msgstr "é?®ä»¶ä½?å?«æ??"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "Message contains"
 msgstr "ä¿¡ä»¶å?«æ??"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1432
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶äººå?«æ??"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "Sender contains"
 msgstr "å??ä»¶äººå?«æ??"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Subject contains"
 msgstr "ä¸»é¢?å?«æ??"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Recipients contains"
-msgstr "ä¸»é¢?æ??æ?¥æ?¶è??å?«æ??"
+#, fuzzy
+msgid "Subject or Addresses 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 æ??å?¡å?¨æ?¯æ?? SSL æ?¶æ??è¿?æ?¥å?°æ?¨ç?? LDAP "
+"æ??å?¡å?¨ã??"
+
+#: ../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 æ??å?¡å?¨æ?¯æ?? TLS æ?¶æ??è¿?æ?¥å?°æ?¨ç?? LDAP "
+"æ??å?¡å?¨ã??"
+
+#: ../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
+#, fuzzy
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "ç??æ?¥å??çºªå¿µæ?¥"
+
+#: ../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 ""
+"æ??ç´¢è??å?´å®?ä¹?äº?æ?¨æ?³è¦?å?¨ç?®å½?æ ?ä¸æ??ç´¢å¤?æ·±ã??æ??ç´¢è??å?´è?¥ä¸ºâ??å?çº§â??ï¼?å??å°?å??å?«æ?¨æ??å®?ç??"
+"æ??ç´¢å?ºç¡?ä¸?æ??å±?ç??å?¨é?¨é¡¹ã??æ??ç´¢è??å?´è?¥ä¸ºâ??ä¸?çº§â??ï¼?å??å?ªä¼?å??å?«æ?¨æ??å®?ç??æ??ç´¢å?ºç¡?ä¹?ä¸?ä¸?"
+"çº§ç??é¡¹ç?®ã??"
+
+#: ../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 "æ??ç´¢"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Sender contains"
+#: ../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
+#, fuzzy
+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
+#, fuzzy
+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 "è¡¥å?¨ URI å??è¡¨ç?? EFolderList xml"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "è¡¥å?¨ URI å??è¡¨ç?? 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 ""
+
+#: ../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
+#: ../modules/mail/em-mailer-prefs.c:1152
+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:814
+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:821
+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:730
+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:396
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../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:759
+#: ../modules/calendar/e-memo-shell-backend.c:583
+#: ../modules/calendar/e-task-shell-backend.c:593
+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:380
+msgid "Current View"
+msgstr "å½?å??è§?å?¾"
+
+#: ../modules/addressbook/e-book-shell-content.c:381
+msgid "The currently selected address book view"
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-content.c:390
+#, fuzzy
+msgid "Previewed Contact"
+msgstr "æ?°å»ºè??ç³»äºº"
+
+#: ../modules/addressbook/e-book-shell-content.c:391
+#, fuzzy
+msgid "The contact being shown in the preview pane"
+msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
+
+#: ../modules/addressbook/e-book-shell-content.c:400
+#: ../modules/calendar/e-memo-shell-content.c:611
+#: ../modules/calendar/e-task-shell-content.c:634
+#: ../modules/mail/e-mail-shell-content.c:726
+#, fuzzy
+msgid "Preview is Visible"
+msgstr "ä¾§è¾¹æ ?å?¯è§?"
+
+#: ../modules/addressbook/e-book-shell-content.c:401
+#: ../modules/calendar/e-memo-shell-content.c:612
+#: ../modules/calendar/e-task-shell-content.c:635
+#: ../modules/mail/e-mail-shell-content.c:727
+#, fuzzy
+msgid "Whether the preview pane is visible"
+msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../modules/mail/e-mail-shell-migrate.c:1106
+msgid "Migrating..."
+msgstr "æ£å?¨å??è¿?..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../modules/mail/e-mail-shell-migrate.c:1179
+#, c-format
+msgid "Migrating '%s':"
+msgstr "å??è¿?â??%sâ??ï¼?"
+
+#: ../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 å??æ¥æ?´æ?°æ?¥å¿?å??å?°å?¾æ??ä»¶å·²ç»?æ?´æ?¹ã??\n"
+"\n"
+"è¯·ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç?? Pilot å??æ¥æ?°æ?®..."
+
+#: ../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
+#, fuzzy
+msgid "Source Selector Widget"
+msgstr "å¤?å¿?æ?¥æº?é??æ?©å?¨"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:182
+#, fuzzy
+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:563
+msgid "Save as vCard"
+msgstr "å?¦å?ä¸º VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:707
+msgid "Co_py All Contacts To..."
+msgstr "å°?å?¨é?¨è??ç³»äººå¤?å?¶å?°(_P)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:709
+#, fuzzy
+msgid "Copy the contacts of the selected address book to another"
+msgstr "æ??é??ä¸æ??ä»¶å¤¹ä¸ç??è??ç³»äººå¤?å?¶å?°å?¶å®?æ??ä»¶å¤¹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:714
+msgid "Del_ete Address Book"
+msgstr "å? é?¤å?°å??ç°¿(_E)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:716
+#, fuzzy
+msgid "Delete the selected address book"
+msgstr "å? é?¤é??ä¸ç??æ??ä»¶å¤¹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:721
+msgid "Mo_ve All Contacts To..."
+msgstr "å°?å?¨é?¨è??ç³»äººç§»è?³(_V)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:723
+#, fuzzy
+msgid "Move the contacts of the selected address book to another"
+msgstr "æ??é??ä¸æ??ä»¶å¤¹ä¸ç??è??ç³»äººç§»è?³å?¶å®?æ??ä»¶å¤¹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:728
+msgid "_New Address Book"
+msgstr "æ?°å»ºå?°å??ç°¿(_N)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:735
+msgid "Address _Book Properties"
+msgstr "å?°å??ç°¿å±?æ?§(_B)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:737
+#, fuzzy
+msgid "Show properties of the selected address book"
+msgstr "æ?´æ?¹é??ä¸æ??ä»¶å¤¹ç??å±?æ?§"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:742
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
+msgid "_Rename..."
+msgstr "é??å?½å??(_R)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:744
+#, fuzzy
+msgid "Rename the selected address book"
+msgstr "é??å?½å??é??ä¸æ??ä»¶å¤¹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:749
+msgid "S_ave Address Book as vCard"
+msgstr "ä¿?å?å?°å??ç°¿ä¸º VCard(_A)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:751
+#, fuzzy
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "æ??é??ä¸æ??ä»¶å¤¹ä¸ç??ç??è??ç³»äººä¿?å?ä¸º VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:758
+msgid "Stop loading"
+msgstr "å??æ¢è½½å?¥"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:765
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+msgid "Copy the selection"
+msgstr "å¤?å?¶é??ä¸å??å®¹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-actions.c:1329
+msgid "Cut the selection"
+msgstr "å?ªå??é??ä¸å??å®¹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+msgid "Paste the clipboard"
+msgstr "ç²?è´´å?ªè´´æ?¿"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:784
+#, fuzzy
+msgid "_Copy Contact To..."
+msgstr "å°?è??ç³»äººå¤?å?¶å?°(_C)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:786
+#, fuzzy
+msgid "Copy selected contacts to another address book"
+msgstr "æ??é??ä¸ç??è??ç³»äººå¤?å?¶å?°å?¶å®?æ??ä»¶å¤¹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:791
+msgid "_Delete Contact"
+msgstr "å? é?¤è??ç³»äºº(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:793
+msgid "Delete selected contacts"
+msgstr "å? é?¤é??ä¸ç??è??ç³»äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:798
+msgid "_Forward Contact..."
+msgstr "è½¬å??è??ç³»äºº(_F)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:800
+msgid "Send selected contacts to another person"
+msgstr "æ??é??ä¸ç??è??ç³»äººå??é??ç»?å?¶ä»?äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
+#, fuzzy
+msgid "_Move Contact To..."
+msgstr "å°?è??ç³»äººç§»è?³(_M)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
+#, fuzzy
+msgid "Move selected contacts to another address book"
+msgstr "æ??é??ä¸ç??è??ç³»äººç§»è?³å?¶å®?æ??ä»¶å¤¹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
+msgid "_New Contact..."
+msgstr "æ?°å»ºè??ç³»äºº(_N)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
+msgid "New Contact _List..."
+msgstr "æ?°å»ºè??ç³»äººå??è¡¨(_L)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
+msgid "_Open Contact"
+msgstr "æ??å¼?è??ç³»äºº(_O)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
+msgid "View the current contact"
+msgstr "æ?¥ç??å½?å??è??ç³»äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
+msgid "Select all contacts"
+msgstr "é??ä¸å?¨é?¨è??ç³»äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
+msgid "_Send Message to Contact..."
+msgstr "ç»?è??ç³»äººå??ä¿¡ä»¶(_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+msgid "Send a message to the selected contacts"
+msgstr "ç»?é??ä¸ç??è??ç³»äººå??ä¿¡ä»¶"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:848
+msgid "_Actions"
+msgstr "æ??ä½?(_A)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
+#: ../modules/calendar/e-memo-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
+msgid "_Preview"
+msgstr "é¢?è§?(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-task-shell-view-actions.c:762
+msgid "_Delete"
+msgstr "å? é?¤(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
+msgid "_Properties"
+msgstr "å±?æ?§(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+msgid "_Save as vCard..."
+msgstr "å?¦å?ä¸º vCard(_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
+msgid "Contact _Preview"
+msgstr "è??ç³»äººé¢?è§?(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
+msgid "Show contact preview window"
+msgstr "æ?¾ç¤ºè??ç³»äººé¢?è§?çª?å?£"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1328
+msgid "_Classic View"
+msgstr "å??ç±»è§?å?¾(_C)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#, fuzzy
+msgid "Show contact preview below the contact list"
+msgstr "å?¨ä¿¡ä»¶å??è¡¨ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1335
+msgid "_Vertical View"
+msgstr "å??ç?´è§?å?¾(_V)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#, fuzzy
+msgid "Show contact preview alongside the contact list"
+msgstr "æ?¾ç¤ºè??ç³»äººé¢?è§?çª?å?£"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-memo-shell-view-actions.c:806
+#: ../modules/calendar/e-task-shell-view-actions.c:977
+msgid "Any Category"
+msgstr "ä»»ä½?ç±»å?«"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../modules/calendar/e-cal-shell-view-actions.c:1648
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1012
+msgid "Unmatched"
+msgstr "æ? å?¹é??"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/mail/e-mail-shell-view-actions.c:1411
+msgid "Advanced search"
+msgstr "é«?çº§æ??ç´¢"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#, fuzzy
+msgid "Print all shown contacts"
+msgstr "æ??å?°é??ä¸ç??è??ç³»äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#, fuzzy
+msgid "Preview the contacts to be printed"
+msgstr "é¢?è§?å°?è¦?æ??å?°ç??è??ç³»äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+msgid "Print selected contacts"
+msgstr "æ??å?°é??ä¸ç??è??ç³»äºº"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
+msgid "Save as vCard..."
+msgstr "å?¦å?ä¸º VCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1040
+#, fuzzy
+msgid "Save selected contacts as a vCard"
+msgstr "æ??é??ä¸ç??è??ç³»äººä¿?å?ä¸º VCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:336
+msgid "_Forward Contacts"
+msgstr "è½¬å??è??ç³»äºº(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:338
+msgid "_Forward Contact"
+msgstr "è½¬å??è??ç³»äºº(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:373
+#, fuzzy
+msgid "_Send Message to Contacts"
+msgstr "ç»?è??ç³»äººå??ä¿¡ä»¶(_M)"
+
+#: ../modules/addressbook/e-book-shell-view.c:375
+#, fuzzy
+msgid "_Send Message to List"
+msgstr "ç»?å??è¡¨å??ä¿¡ä»¶(_M)"
+
+#: ../modules/addressbook/e-book-shell-view.c:377
+#, fuzzy
+msgid "_Send Message to Contact"
+msgstr "ç»?è??ç³»äººå??ä¿¡ä»¶(_M)"
+
+#: ../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)ï¼?"
+
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "One"
+msgstr "ä¸?æ¬¡"
+
+#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "Search Filter"
+msgstr "æ??ç´¢è¿?æ»¤å?¨"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search _base:"
+msgstr "æ??ç´¢å?ºç¡?(_B)ï¼?"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _filter:"
+msgstr "æ??ç´¢è¿?æ»¤å?¨(_F)ï¼?"
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+#, fuzzy
+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 ""
+"æ??ç´¢è¿?æ»¤å?¨æ?¯æ??æ?§è¡?æ??ç´¢æ?¶è¦?æ??ç´¢ç??å¯¹è±¡ç±»å??ã??å¦?æ??æ²¡æ??ä¿®æ?¹è¿?ç??è¯?ï¼?é»?è®¤æ??å?µä¸?æ??ç´¢"
+"å°?ä¼?å?¨â??ä¸ªäººâ??ç±»å??ç??å¯¹è±¡ç±»å??ã??"
+
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid "Sub"
+msgstr "å?"
+
+#: ../modules/addressbook/ldap-config.ui.h:18
+msgid "Supported Search Bases"
+msgstr "æ?¯æ??ç??æ??ç´¢èµ·ç?¹"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "Using distinguished name (DN)"
+msgstr "ä½¿ç?¨å·²è¯?å?«ç??å§?å??(DN)"
+
+#: ../modules/addressbook/ldap-config.ui.h:21
+msgid "Using email address"
+msgstr "ä½¿ç?¨ç?µå?é?®ä»¶å?°å??"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "_Download limit:"
+msgstr "ä¸?è½½é??å?¶(_D)ï¼?"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "_Find Possible Search Bases"
+msgstr "æ?¥æ?¾å?¯è?½ç??æ??ç´¢å?ºç¡?(_F)"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Login method:"
+msgstr "ç?»å½?æ?¹å¼?(_L)ï¼?"
+
+#: ../modules/addressbook/ldap-config.ui.h:26
+msgid "_Port:"
+msgstr "ç«¯å?£(_P)ï¼?"
+
+#: ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Search scope:"
+msgstr "æ??ç´¢è??å?´(_S)ï¼?"
+
+#: ../modules/addressbook/ldap-config.ui.h:29
+msgid "_Timeout:"
+msgstr "è¶?æ?¶(_T)ï¼?"
+
+#: ../modules/addressbook/ldap-config.ui.h:30
+msgid "_Use secure connection:"
+msgstr "ä½¿ç?¨å®?å?¨è¿?æ?¥(_U)ï¼?"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+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:122
+#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "ç½?ä¸?"
+
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "å¤©æ°?"
+
+#: ../modules/calendar/e-cal-shell-backend.c:238
+#: ../modules/calendar/e-cal-shell-migrate.c:483
+msgid "Birthdays & Anniversaries"
+msgstr "ç??æ?¥å??çºªå¿µæ?¥"
+
+#: ../modules/calendar/e-cal-shell-backend.c:424
+msgctxt "New"
+msgid "_Appointment"
+msgstr "çº¦ä¼?(_A)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+msgid "Create a new appointment"
+msgstr "å??å»ºæ?°çº¦ä¼?"
+
+#: ../modules/calendar/e-cal-shell-backend.c:431
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "å?¨å¤©çº¦ä¼?(_P)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:433
+msgid "Create a new all-day appointment"
+msgstr "å??å»ºæ?°å?¨å¤©çº¦ä¼?"
+
+#: ../modules/calendar/e-cal-shell-backend.c:438
+msgctxt "New"
+msgid "M_eeting"
+msgstr "ä¼?è®®(_E)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:440
+msgid "Create a new meeting request"
+msgstr "å??å»ºä¸?æ?¡æ?°ä¼?è®®è¯·æ±?"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "æ?¥å??(_N)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+msgid "Create a new calendar"
+msgstr "å??å»ºæ?°æ?¥å??"
+
+#: ../modules/calendar/e-cal-shell-backend.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:2645
+msgid "Calendar and Tasks"
+msgstr "æ?¥å??å??ä»»å?¡"
+
+#: ../modules/calendar/e-cal-shell-backend.c:760
+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:188
+msgid "Loading calendars"
+msgstr "è£?å?¥æ?¥å??"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:428
+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 æ??å¼?æ?¥å??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:246
+msgid "Print"
+msgstr "æ??å?°"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:305
+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:322
+msgid "Purge events older than"
+msgstr "é??æ¯?è¾?æ?©ç??äº?ä»¶"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:558
+msgid "Copying Items"
+msgstr "å¤?å?¶é¡¹ç?®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:808
+msgid "Moving Items"
+msgstr "ç§»å?¨é¡¹ç?®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1109
+#: ../modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-memo-shell-view-actions.c:530
+#: ../modules/calendar/e-task-shell-view-actions.c:655
+msgid "Save as iCalendar"
+msgstr "ä¿?å?ä¸º iCalendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+msgid "_Copy..."
+msgstr "å¤?å?¶(_C)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+msgid "Go Back"
+msgstr "å??é??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+msgid "Go Forward"
+msgstr "å??è¿?"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+msgid "Select _Today"
+msgstr "é??æ?©ä»?å¤©(_T)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Select today"
+msgstr "é??æ?©ä»?å¤©"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+msgid "Select _Date"
+msgstr "é??æ?©æ?¥æ??(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+msgid "Select a specific date"
+msgstr "é??æ?©ç?¹å®?æ?¥æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "_New Calendar"
+msgstr "æ?°å»ºæ?¥å??(_N)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-task-shell-view-actions.c:839
+msgid "Purg_e"
+msgstr "é??æ¯?(_E)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+msgid "Purge old appointments and meetings"
+msgstr "é??æ¯?æ?§çº¦ä¼?å??ä¼?è®®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-task-shell-view-actions.c:783
+msgid "Re_fresh"
+msgstr "å?·æ?°(_F)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#, fuzzy
+msgid "Refresh the selected calendar"
+msgstr "é??å?½å??é??ä¸ç??æ?¥å??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+msgid "Rename the selected calendar"
+msgstr "é??å?½å??é??ä¸ç??æ?¥å??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+msgid "Show _Only This Calendar"
+msgstr "å?ªæ?¾ç¤ºæ¤æ?¥å??(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+msgid "Cop_y to Calendar..."
+msgstr "å¤?å?¶å?°æ?¥å??(_Y)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+msgid "_Delegate Meeting..."
+msgstr "ä»£ç??ä¼?è®®(_D)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+msgid "Delete the appointment"
+msgstr "å? é?¤çº¦ä¼?"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+msgid "Delete This _Occurrence"
+msgstr "å? é?¤æ¤æ¬¡å?ºç?°(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+msgid "Delete this occurrence"
+msgstr "å? é?¤æ¤æ¬¡å??ç??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+msgid "Delete _All Occurrences"
+msgstr "å? é?¤æ??æ??å?ºç?°(_A)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+msgid "Delete all occurrences"
+msgstr "å? é?¤å?¨é?¨å??ç??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+msgid "New All Day _Event..."
+msgstr "æ?°å»ºå?¨å¤©äº?ä»¶(_E)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+msgid "Create a new all day event"
+msgstr "å??å»ºä¸?ä¸ªæ?°ç??å?¨å¤©äº?ä»¶"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-memopad.c:322
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-task-shell-view-actions.c:748
+msgid "_Forward as iCalendar..."
+msgstr "ä½?ä¸º iCalendar è½¬å??(_F)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+msgid "New _Meeting..."
+msgstr "æ?°å»ºä¼?è®®(_M)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+msgid "Create a new meeting"
+msgstr "å??å»ºä¸?ä¸ªæ?°ç??ä¼?è®®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+msgid "Mo_ve to Calendar..."
+msgstr "ç§»è?³æ?¥å??(_V)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+msgid "New _Appointment..."
+msgstr "æ?°å»ºçº¦ä¼?(_A)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+msgid "Make this Occurrence _Movable"
+msgstr "å°?æ¤æ¬¡å??ç??å??ä¸ºå?¯ç§»å?¨(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+msgid "_Open Appointment"
+msgstr "æ??å¼?çº¦ä¼?(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+msgid "View the current appointment"
+msgstr "æ?¥ç??å½?å??çº¦ä¼?"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+msgid "_Reply"
+msgstr "å??å¤?(_R)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-view-memopad.c:350
+msgid "Save as iCalendar..."
+msgstr "ä¿?å?ä¸º iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+msgid "_Schedule Meeting..."
+msgstr "è°?åº¦ä¼?è®®(_S)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#, fuzzy
+msgid "Converts an appointment to a meeting"
+msgstr "é??æ¯?æ?§çº¦ä¼?å??ä¼?è®®"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Conv_ert to Appointment..."
+msgstr "è½¬æ?¢å?°çº¦ä¼?(_E)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#, fuzzy
+msgid "Converts a meeting to an appointment"
+msgstr "å?¨çº¦ä¼?ç»?æ??æ?¶ %s"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1589
+msgid "Day"
+msgstr "å¤©"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
+msgid "Show one day"
+msgstr "æ?¾ç¤ºä¸?å¤©"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1596
+msgid "List"
+msgstr "å??è¡¨"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
+msgid "Show as list"
+msgstr "æ?¾ç¤ºä¸ºå??è¡¨"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1603
+msgid "Month"
+msgstr "æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+msgid "Show one month"
+msgstr "æ?¾ç¤ºä¸?ä¸ªæ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1610
+msgid "Week"
+msgstr "å?¨"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1612
+msgid "Show one week"
+msgstr "æ?¾ç¤ºä¸?å?¨"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#, fuzzy
+msgid "Show one work week"
+msgstr "æ?¾ç¤ºä¸?å?¨"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+msgid "Active Appointments"
+msgstr "æ´»å?¨çº¦ä¼?"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+msgid "Next 7 Days' Appointments"
+msgstr "ä¸?ä¸?å?¨ç??çº¦ä¼?"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-memo-shell-view-actions.c:837
+#: ../modules/calendar/e-task-shell-view-actions.c:1036
+msgid "Description contains"
+msgstr "æ??è¿°å?«æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
+msgid "Summary contains"
+msgstr "æ¦?è¦?å?«æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1691
+msgid "Print this calendar"
+msgstr "æ??å?°æ¤æ?¥å??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1698
+#, fuzzy
+msgid "Preview the calendar to be printed"
+msgstr "é¢?è§?å°?è¦?æ??å?°ç??æ?¥å??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1766
+msgid "Go To"
+msgstr "è½¬å?°"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:76
+#: ../modules/calendar/e-memo-shell-view-actions.c:97
+msgid "Deleting selected memos..."
+msgstr "å? é?¤é??ä¸ç??å¤?å¿?..."
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
+msgid "Copy selected memo"
+msgstr "å¤?å?¶é??ä¸ç??å¤?å¿?"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:303
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+msgid "Cut selected memo"
+msgstr "å?ªå??é??ä¸ç??å¤?å¿?"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:310
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+msgid "Paste memo from the clipboard"
+msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´å¤?å¿?"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:315
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
+msgid "_Delete Memo"
+msgstr "å? é?¤å¤?å¿?(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+msgid "Delete selected memos"
+msgstr "å? é?¤é??ä¸ç??å¤?å¿?"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:329
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
+msgid "New _Memo"
+msgstr "æ?°å»ºå¤?å¿?(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:331
+#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-view-actions.c:682
+msgid "Create a new memo"
+msgstr "å??å»ºæ?°å¤?å¿?"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:336
+#: ../modules/calendar/e-memo-shell-view-actions.c:687
+msgid "_Open Memo"
+msgstr "æ??å¼?å¤?å¿?(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:338
+#: ../modules/calendar/e-memo-shell-view-actions.c:689
+msgid "View the selected memo"
+msgstr "æ?¥ç??é??ä¸ç??å¤?å¿?"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:343
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:431
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:832
+msgid "Open _Web Page"
+msgstr "æ??å¼?ç½?é¡µ(_W)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:870
+msgid "Print the selected memo"
+msgstr "æ??å?°é??ä¸ç??å¤?å¿?"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:444
+#: ../modules/calendar/e-memo-shell-view.c:232
+msgid "Delete Memo"
+msgid_plural "Delete Memos"
+msgstr[0] "å? é?¤å¤?å¿?"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
+#: ../modules/calendar/e-task-shell-view-actions.c:128
+msgid "Deleting selected tasks..."
+msgstr "å? é?¤é??ä¸ç??ä»»å?¡..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-task-shell-view-actions.c:713
+msgid "_Assign Task"
+msgstr "å??é??ä»»å?¡(_A)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../modules/calendar/e-task-shell-view-actions.c:722
+msgid "Copy selected tasks"
+msgstr "å¤?å?¶é??ä¸ç??ä»»å?¡"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+msgid "Cut selected tasks"
+msgstr "å?ªå??é??ä¸ç??ä»»å?¡"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+msgid "Paste tasks from the clipboard"
+msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´ä»»å?¡"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
+#: ../modules/calendar/e-task-shell-view-actions.c:741
+msgid "_Delete Task"
+msgstr "å? é?¤ä»»å?¡(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
+#: ../modules/calendar/e-task-shell-view-actions.c:743
+msgid "Delete selected tasks"
+msgstr "å? é?¤é??ä¸ç??ä»»å?¡"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
+#: ../modules/calendar/e-task-shell-view-actions.c:804
+msgid "_Mark as Complete"
+msgstr "æ ?è®°ä¸ºå®?æ??(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
+#: ../modules/calendar/e-task-shell-view-actions.c:806
+msgid "Mark selected tasks as complete"
+msgstr "æ??é??ä¸ä»»å?¡æ ?è®°ä¸ºå®?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:410
+msgid "_Mark as Incomplete"
+msgstr "æ ?è®°ä¸ºæ?ªå®?æ??(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:412
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+#, fuzzy
+msgid "Mark selected tasks as incomplete"
+msgstr "æ??é??ä¸ä»»å?¡æ ?è®°ä¸ºå®?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
+#: ../modules/calendar/e-task-shell-view-actions.c:818
+msgid "New _Task"
+msgstr "æ?°å»ºä»»å?¡(_T)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:419
+#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-view-actions.c:820
+msgid "Create a new task"
+msgstr "å??å»ºæ?°ä»»å?¡"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:424
+#: ../modules/calendar/e-task-shell-view-actions.c:825
+msgid "_Open Task"
+msgstr "æ??å¼?ä»»å?¡(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:426
+#: ../modules/calendar/e-task-shell-view-actions.c:827
+msgid "View the selected task"
+msgstr "æ?¥ç??é??ä¸ç??ä»»å?¡"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:438
+#: ../modules/calendar/e-memo-shell-view-actions.c:885
+#: ../modules/calendar/e-task-shell-view-actions.c:1084
+msgid "_Save as iCalendar..."
+msgstr "ä¿?å?ä¸º iCalendar(_S)..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:450
+#: ../modules/calendar/e-task-shell-view-actions.c:1069
+msgid "Print the selected task"
+msgstr "æ??å?°é??ä¸ç??ä»»å?¡"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:555
+#: ../modules/calendar/e-task-shell-view.c:359
+msgid "Delete Task"
+msgid_plural "Delete Tasks"
+msgstr[0] "å? é?¤ä»»å?¡"
+
+#: ../modules/calendar/e-memo-shell-backend.c:316
+msgctxt "New"
+msgid "Mem_o"
+msgstr "å¤?å¿?(_O)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:323
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "å?±äº«ç??å¤?å¿?(_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+msgid "Create a new shared memo"
+msgstr "å??å»ºä¸?ä¸ªæ?°ç??å?±äº«å¤?å¿?"
+
+#: ../modules/calendar/e-memo-shell-backend.c:333
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "å¤?å¿?å??è¡¨(_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+msgid "Create a new memo list"
+msgstr "å??å»ºæ?°å¤?å¿?å??è¡¨"
+
+#: ../modules/calendar/e-memo-shell-backend.c:584
+#, fuzzy
+msgid "The registry of memo lists"
+msgstr "æ??å?°å¤?å¿?å??è¡¨"
+
+#: ../modules/calendar/e-memo-shell-content.c:602
+#, fuzzy
+msgid "The memo table model"
+msgstr "è¡¨æ ¼æ¨¡å??"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:185
+msgid "Loading memos"
+msgstr "è£?å?¥å¤?å¿?"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:399
+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 æ??å¼?å¤?å¿?"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:254
+#: ../modules/calendar/e-memo-shell-view-actions.c:271
+msgid "Print Memos"
+msgstr "æ??å?°å¤?å¿?"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
+msgid "_New Memo List"
+msgstr "æ?°å»ºå¤?å¿?å??è¡¨(_N)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
+#, fuzzy
+msgid "Refresh the selected memo list"
+msgstr "é??å?½å??é??ä¸æ??ä»¶å¤¹"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#, fuzzy
+msgid "Rename the selected memo list"
+msgstr "é??å?½å??é??ä¸æ??ä»¶å¤¹"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#, fuzzy
+msgid "Show _Only This Memo List"
+msgstr "å?ªæ?¾ç¤ºæ¤å¤?å¿?å??è¡¨(_O)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+msgid "Memo _Preview"
+msgstr "å¤?å¿?é¢?è§?(_P)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:770
+#, fuzzy
+msgid "Show memo preview pane"
+msgstr "æ?¾ç¤ºé¢?è§?é?¢æ?¿"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#, fuzzy
+msgid "Show memo preview below the memo list"
+msgstr "å?¨ä¿¡ä»¶å??è¡¨ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#, fuzzy
+msgid "Show memo preview alongside the memo list"
+msgstr "å?¨ä¿¡ä»¶å??è¡¨ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:856
+msgid "Print the list of memos"
+msgstr "æ??å?°å¤?å¿?å??è¡¨"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:863
+#, fuzzy
+msgid "Preview the list of memos to be printed"
+msgstr "é¢?è§?è¦?æ??å?°ç??å¤?å¿?å??è¡¨"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:417
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d ä¸ªå¤?å¿?"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:421
+#: ../modules/calendar/e-task-shell-view-private.c:572
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "ï¼?å·²é??ä¸ %d ä¸ª"
+
+#: ../modules/calendar/e-memo-shell-view.c:230
+msgid "Delete Memos"
+msgstr "å? é?¤å¤?å¿?"
+
+#: ../modules/calendar/e-task-shell-backend.c:320
+msgctxt "New"
+msgid "_Task"
+msgstr "ä»»å?¡(_T)"
+
+#: ../modules/calendar/e-task-shell-backend.c:327
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "å??é??ç??ä»»å?¡(_D)"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgid "Create a new assigned task"
+msgstr "å??å»ºæ?°å??é??ç??ä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-backend.c:337
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "ä»»å?¡å??è¡¨(_K)"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+msgid "Create a new task list"
+msgstr "å??å»ºæ?°ä»»å?¡å??è¡¨"
+
+#: ../modules/calendar/e-task-shell-backend.c:594
+#, fuzzy
+msgid "The registry of task lists"
+msgstr "æ??å?°ä»»å?¡å??è¡¨"
+
+#: ../modules/calendar/e-task-shell-content.c:625
+#, fuzzy
+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:183
+msgid "Loading tasks"
+msgstr "è£?å?¥ä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:397
+#, fuzzy
+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:285
+#: ../modules/calendar/e-task-shell-view-actions.c:302
+msgid "Print Tasks"
+msgstr "æ??å?°ä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:600
+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:755
+msgid "Copy..."
+msgstr "å¤?å?¶..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:769
+msgid "_New Task List"
+msgstr "æ?°å»ºä»»å?¡å??è¡¨(_N)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+#, fuzzy
+msgid "Refresh the selected task list"
+msgstr "é??å?½å??é??ä¸æ??ä»¶å¤¹"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+#, fuzzy
+msgid "Rename the selected task list"
+msgstr "é??å?½å??é??ä¸æ??ä»¶å¤¹"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:797
+msgid "Show _Only This Task List"
+msgstr "å?ªæ?¾ç¤ºæ¤ä»»å?¡å??è¡¨(_O)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:811
+msgid "Mar_k as Incomplete"
+msgstr "æ ?è®°ä¸ºæ?ªå®?æ??(_K)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:841
+msgid "Delete completed tasks"
+msgstr "å? é?¤å·²å®?æ??ç??ä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:932
+msgid "Task _Preview"
+msgstr "ä»»å?¡é¢?è§?(_P)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:934
+#, fuzzy
+msgid "Show task preview pane"
+msgstr "æ?¾ç¤ºé¢?è§?é?¢æ?¿"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:955
+#, fuzzy
+msgid "Show task preview below the task list"
+msgstr "å?¨ä¿¡ä»¶å??è¡¨ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:962
+#, fuzzy
+msgid "Show task preview alongside the task list"
+msgstr "å?¨ä¿¡ä»¶å??è¡¨ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:970
+msgid "Active Tasks"
+msgstr "æ´»å?¨ä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:984
+msgid "Completed Tasks"
+msgstr "å·²å®?æ??ä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:991
+msgid "Next 7 Days' Tasks"
+msgstr "ä¸?ä¸?å?¨ç??ä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:998
+msgid "Overdue Tasks"
+msgstr "å»¶æ??ä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1005
+msgid "Tasks with Attachments"
+msgstr "æ??é??ä»¶ç??ä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1055
+msgid "Print the list of tasks"
+msgstr "æ??å?°ä»»å?¡å??è¡¨"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1062
+#, fuzzy
+msgid "Preview the list of tasks to be printed"
+msgstr "é¢?è§?è¦?æ??å?°ç??ä»»å?¡å??è¡¨"
+
+#: ../modules/calendar/e-task-shell-view-private.c:464
+msgid "Expunging"
+msgstr "é??æ¯?"
+
+#: ../modules/calendar/e-task-shell-view-private.c:568
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d ä¸ªä»»å?¡"
+
+#: ../modules/calendar/e-task-shell-view.c:357
+msgid "Delete Tasks"
+msgstr "å? é?¤ä»»å?¡"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, c-format
+msgid "%d attached messages"
+msgstr "%d ä¸ªé??å? ç??ä¿¡æ?¯"
+
+#: ../modules/mail/e-mail-shell-backend.c:174
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "ä¿¡ä»¶(_M)"
+
+#: ../modules/mail/e-mail-shell-backend.c:176
+msgid "Compose a new mail message"
+msgstr "æ?°å??ä¸?å°?æ?°ä¿¡"
+
+#: ../modules/mail/e-mail-shell-backend.c:184
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "é?®ä»¶æ??ä»¶å¤¹(_F)"
+
+#: ../modules/mail/e-mail-shell-backend.c:186
+msgid "Create a new mail folder"
+msgstr "å??å»ºæ?°é?®ä»¶æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-backend.c:205
+msgid "Mail Accounts"
+msgstr "é?®ä»¶è´¦æ?·"
+
+#: ../modules/mail/e-mail-shell-backend.c:213
+msgid "Mail Preferences"
+msgstr "é?®ä»¶é¦?é??é¡¹"
+
+#: ../modules/mail/e-mail-shell-backend.c:221
+msgid "Composer Preferences"
+msgstr "ç¼?å??å?¨é¦?é??é¡¹"
+
+#: ../modules/mail/e-mail-shell-backend.c:229
+msgid "Network Preferences"
+msgstr "ç½?ç»?é¦?é??é¡¹"
+
+#. green
+#: ../modules/mail/e-mail-shell-migrate.c:959
+msgid "To Do"
+msgstr "å¾?å??"
+
+#. blue
+#: ../modules/mail/e-mail-shell-migrate.c:960
+msgid "Later"
+msgstr "ç¨?å??"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1139
+msgid "Migration"
+msgstr "è¿?ç§»"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1589
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "æ? æ³?å??å»ºæ?°æ??ä»¶å¤¹â??%sâ??ï¼?%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1617
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "æ? æ³?å°?æ??ä»¶å¤¹â??%sâ??å¤?å?¶ä¸ºâ??%sâ??ï¼?%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1812
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "æ? æ³?æ?«æ??ä½?äº?â??%sâ??ç??å·²æ??é?®ç®±ï¼?%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1818
+#: ../modules/mail/e-mail-shell-migrate.c:2915
+msgid "Migrating Folders"
+msgstr "è¿?ç§»æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1819
+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 æ£å?¨å??è¿?æ?¨ç??æ??ä»¶å¤¹..."
+
+#: ../modules/mail/e-mail-shell-migrate.c:2022
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "æ? æ³?æ??å¼?æ?§ç?? POP ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®â??%sâ??ï¼?%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2038
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "æ? æ³?å??å»º POP3 ä¿?ç??å?¨æ??å?¡å?¨ä¸?ç??æ?°æ?®ç?®å½?â??%sâ??ï¼?%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2070
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "æ? æ³?å¤?å?¶ POP3 å?¨æ??å?¡å?¨ä¸?ä¿?ç??ç??æ?°æ?®â??%sâ??ï¼?%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2541
+#: ../modules/mail/e-mail-shell-migrate.c:2555
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "å??å»ºæ?¬å?°é?®ä»¶å?å?¨â??%sâ??å¤±è´¥ï¼?%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2916
+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 2.4 ä¹?å??ï¼?Evolution é?®ç®±æ??ä»¶å¤¹ç??æ??è¦?æ ¼å¼?ç?°å·²ç§»è?³ SQLiteã??\n"
+"\n"
+"è¯·ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??ä»¶å¤¹..."
+
+#: ../modules/mail/e-mail-shell-migrate.c:3013
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "æ? æ³?å?¨â??%sâ??å??å»ºæ?¬å?°é?®ä»¶æ??ä»¶å¤¹ï¼?%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:3031
+#, 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â??ä¸?å?å?¨æ??è??å·²æ??"
+"å??ã??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:993
+#: ../modules/mail/e-mail-shell-view.c:511
+msgid "_Disable Account"
+msgstr "ç¦?ç?¨è´¦æ?·(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:995
+msgid "Disable this account"
+msgstr "ç¦?ç?¨è¿?ä¸ªè´¦æ?·"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
+msgid "C_reate Search Folder From Search..."
+msgstr "ä»?å¤´å??å»ºæ??ç´¢æ??ä»¶å¤¹(_R)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
+msgid "_Download Messages for Offline Usage"
+msgstr "ä¸?è½½ä¿¡ä»¶ä»¥ç¦»çº¿ä½¿ç?¨(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
+#, fuzzy
+msgid "Download messages of accounts and folders marked for offline"
+msgstr "ä¸ºæ ?è®°ä¸ºè?±æ?ºç??å¸?æ?·/æ??ä»¶å¤¹ä¸?è½½ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
+msgid "Empty _Trash"
+msgstr "æ¸?ç©ºå??æ?¶ç«?(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1016
+#: ../modules/mail/e-mail-shell-view-actions.c:1023
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??ä»¶å¤¹ä¸ç??æ??æ??å·²å? é?¤ç??ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
+msgid "Fl_ush Outbox"
+msgstr "æ¸?ç©ºå??ä»¶ç®±(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1035
+msgid "_Copy Folder To..."
+msgstr "æ??ä»¶å¤¹å¤?å?¶å?°(_C)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1037
+msgid "Copy the selected folder into another folder"
+msgstr "æ??é??ä¸ç??æ??ä»¶å¤¹å¤?å?¶å?°å?¶å®?æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1044
+msgid "Permanently remove this folder"
+msgstr "æ°¸ä¹?å? é?¤æ¤æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
+msgid "E_xpunge"
+msgstr "é??æ¯?(_X)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1051
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "ä»?è¯¥æ??ä»¶å¤¹æ°¸ä¹?å? é?¤æ??æ??å·²å? é?¤ç??ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
+msgid "Mar_k All Messages as Read"
+msgstr "æ??å?¨é?¨ä¿¡ä»¶æ ?è®°ä¸ºå·²è¯»(_K)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1058
+msgid "Mark all messages in the folder as read"
+msgstr "å°?æ¤æ??ä»¶å¤¹ä¸ç??æ??æ??ä¿¡ä»¶æ ?è®°ä¸ºå·²è¯»"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1063
+msgid "_Move Folder To..."
+msgstr "æ??ä»¶å¤¹ç§»è?³(_M)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
+msgid "Move the selected folder into another folder"
+msgstr "æ??é??ä¸ç??æ??ä»¶å¤¹ç§»è?³å?¶å®?æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
+msgid "_New..."
+msgstr "æ?°å»º(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1072
+msgid "Create a new folder for storing mail"
+msgstr "å??å»ºå?å?¨é?®ä»¶ç??æ?°æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1079
+msgid "Change the properties of this folder"
+msgstr "æ?´æ?¹æ¤æ??ä»¶å¤¹ç??å±?æ?§"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1086
+msgid "Refresh the folder"
+msgstr "å?·æ?°æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+msgid "Change the name of this folder"
+msgstr "æ?´æ?¹æ¤æ??ä»¶å¤¹ç??å??ç§°"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
+msgid "Select _All Messages"
+msgstr "é??ä¸å?¨é?¨ä¿¡ä»¶(_A)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1100
+msgid "Select all visible messages"
+msgstr "é??ä¸æ??æ??å?¯è§?ç??ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
+msgid "Select Message _Thread"
+msgstr "é??æ?©ä¿¡ä»¶çº¿ç´¢(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
+msgid "Select all messages in the same thread as the selected message"
+msgstr "æ??å??ä¸?çº¿ç´¢ä¸ç??æ??æ??ä¿¡ä»¶é??æ?©ä¸ºé??ä¸ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
+msgid "Select Message S_ubthread"
+msgstr "é??æ?©ä¿¡ä»¶å?çº¿ç´¢(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
+msgid "Select all replies to the currently selected message"
+msgstr "é??æ?©å½?å??é??ä¸ä¿¡ä»¶ç??æ??æ??å??å¤?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
+msgid "_Unsubscribe"
+msgstr "é??è®¢(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#, fuzzy
+msgid "Unsubscribe from the selected folder"
+msgstr "é??å?½å??é??ä¸æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
+msgid "_New Label"
+msgstr "æ?°å»ºæ ?ç¾(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
+msgid "N_one"
+msgstr "æ? (_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1140
+msgid "Hide _Read Messages"
+msgstr "é??è??å·²è¯»ç??ä¿¡ä»¶(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
+msgid "Temporarily hide all messages that have already been read"
+msgstr "æ??æ?¶é??è??æ??æ??å·²è¯»ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
+msgid "Hide S_elected Messages"
+msgstr "é??è??é??ä¸ç??ä¿¡ä»¶(_E)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
+msgid "Temporarily hide the selected messages"
+msgstr "æ??æ?¶é??è??é??ä¸ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
+msgid "Show Hidde_n Messages"
+msgstr "æ?¾ç¤ºé??è??ç??ä¿¡ä»¶(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
+msgid "Show messages that have been temporarily hidden"
+msgstr "æ?¾ç¤ºæ??æ?¶è¢«é??è??ç??ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
+msgid "Cancel the current mail operation"
+msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
+msgid "Collapse All _Threads"
+msgstr "æ??å? å?¨é?¨çº¿ç´¢(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
+msgid "Collapse all message threads"
+msgstr "æ??å? å?¨é?¨ä¿¡ä»¶çº¿ç´¢"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
+msgid "E_xpand All Threads"
+msgstr "å±?å¼?å?¨é?¨çº¿ç´¢(_X)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
+msgid "Expand all message threads"
+msgstr "å±?å¼?å?¨é?¨ä¿¡ä»¶çº¿ç´¢"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+msgid "_Message Filters"
+msgstr "ä¿¡ä»¶è¿?æ»¤(_M)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
+msgid "Create or edit rules for filtering new mail"
+msgstr "å??å»ºæ??ç¼?è¾?è¿?æ»¤æ?°é?®ä»¶ç??è§?å??"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
+msgid "Search F_olders"
+msgstr "æ??ç´¢æ??ä»¶å¤¹(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#, fuzzy
+msgid "Create or edit search folder definitions"
+msgstr "å??å»ºæ??ç¼?è¾?æ??ç´¢æ??ä»¶å¤¹å®?ä¹?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
+msgid "_Subscriptions..."
+msgstr "è®¢é??(_S)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "è®¢é??æ??é??è®¢è¿?ç¨?æ??å?¡å?¨ä¸?ç??æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
+msgid "F_older"
+msgstr "æ??ä»¶å¤¹(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
+msgid "_Label"
+msgstr "æ ?ç¾(_L)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+msgid "_New Folder..."
+msgstr "æ?°å»ºæ??ä»¶å¤¹(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1290
+msgid "Hide _Deleted Messages"
+msgstr "é??è??å·²å? é?¤ç??ä¿¡ä»¶(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "é??è??å·²å? é?¤ç??ä¿¡ä»¶è??ä¸?æ?¯å?¨ä¸?é?¢æ?¾ç¤ºä¸?æ?¡çº¿"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
+msgid "Show Message _Preview"
+msgstr "æ?¾ç¤ºä¿¡ä»¶é¢?è§?(_P)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#, fuzzy
+msgid "Show message preview pane"
+msgstr "æ?¾ç¤ºä¿¡ä»¶é¢?è§?çª?å?£"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
+msgid "_Group By Threads"
+msgstr "æ??çº¿ç´¢å??ç»?(_G)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#, fuzzy
+msgid "Threaded message list"
+msgstr "æ??çº¿ç´¢ç¼?æ??ç??ä¿¡ä»¶å??è¡¨"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
+msgid "Show message preview below the message list"
+msgstr "å?¨ä¿¡ä»¶å??è¡¨ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#, fuzzy
+msgid "Show message preview alongside the message list"
+msgstr "å?¨ä¿¡ä»¶å??è¡¨ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
+msgid "All Messages"
+msgstr "å?¨é?¨ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
+msgid "Important Messages"
+msgstr "é??è¦?ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
+msgid "Last 5 Days' Messages"
+msgstr "å??äº?å¤©ç??ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
+msgid "Messages Not Junk"
+msgstr "ä¸?æ?¯å??å?¾é?®ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1373
+msgid "Messages with Attachments"
+msgstr "æ??é??ä»¶ç??ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
+msgid "No Label"
+msgstr "æ? æ ?ç¾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
+msgid "Read Messages"
+msgstr "å·²è¯»ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
+msgid "Recent Messages"
+msgstr "æ??è¿?ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
+msgid "Unread Messages"
+msgstr "æ?ªè¯»ä¿¡ä»¶"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#, fuzzy
+msgid "Subject or Addresses contain"
 msgstr "ä¸»é¢?æ??å??é??è??å?«æ??"
 
+#: ../modules/mail/e-mail-shell-view-actions.c:1463
+msgid "All Accounts"
+msgstr "å?¨é?¨è´¦æ?·"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1470
+msgid "Current Account"
+msgstr "å½?å??è´¦æ?·"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
+msgid "Current Folder"
+msgstr "å½?å??æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-view-private.c:835
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "å·²é??ä¸ %d ä¸ªï¼?"
+
+#: ../modules/mail/e-mail-shell-view-private.c:846
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d å°?å·²å? é?¤"
+
+#: ../modules/mail/e-mail-shell-view-private.c:852
+#: ../modules/mail/e-mail-shell-view-private.c:859
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d å°?å??å?¾"
+
+#: ../modules/mail/e-mail-shell-view-private.c:865
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d å°?è??ç¨¿"
+
+#: ../modules/mail/e-mail-shell-view-private.c:871
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d å°?æ?ªå??"
+
+#: ../modules/mail/e-mail-shell-view-private.c:877
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d å°?å·²å??"
+
+#: ../modules/mail/e-mail-shell-view-private.c:889
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "ï¼?%d å°?æ?ªè¯»ï¼?"
+
+#: ../modules/mail/e-mail-shell-view-private.c:892
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "æ?»å?± %d å°?"
+
+#: ../modules/mail/e-mail-shell-view.c:509
+msgid "Proxy _Logout"
+msgstr "ä»£ç??æ??å?¡å?¨æ³¨é??(_L)"
+
+#: ../modules/mail/em-composer-prefs.c:477
+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:326
+#: ../widgets/table/e-table-click-to-add.c:498
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "é¡µç??"
+
+#: ../modules/mail/em-mailer-prefs.c:330
+msgid "Contains Value"
+msgstr "å??å?«å?¼"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:794
+#, 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:731 ../modules/mail/em-mailer-prefs.c:803
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr "%s æ??ä»¶ä¸?å?¯ç?¨ã??è¯·æ£?æ?¥è½¯ä»¶å??æ?¯å?¦å·²å®?è£?ã??"
+
+#: ../modules/mail/em-mailer-prefs.c:767
+#, fuzzy
+msgid "No junk plugin available"
+msgstr "æ²¡æ??å?¯ç?¨ç??å??å?¾é?®ä»¶æ??ä»¶"
+
+#: ../modules/mail/em-mailer-prefs.c:1151
+#, fuzzy
+msgid "Date header:"
+msgstr "è¡¨å¤´"
+
+#: ../modules/mail/em-mailer-prefs.c:1153
+#, fuzzy
+msgid "Show _original header value"
+msgstr "æ?¾ç¤ºå??å§?å¤§å°?(_O)"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "ä½ å¥½ 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 "Local Address Books"
-msgstr "æ?¬å?°å?°å??ç°¿"
+#, fuzzy
+msgid "Add local address books to Evolution."
+msgstr "å??å?ºæ?¬å?°å?°å??ç°¿æ??ä»¶å¤¹"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "æ??ä¾?æ?¬å?°å?°å??ç°¿ç??æ ¸å¿?å??è?½ã??"
+msgid "Local Address Books"
+msgstr "æ?¬å?°å?°å??ç°¿"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -15841,22 +15590,16 @@ msgid ""
 "body."
 msgstr "æ¶?æ?¯ä¸»ä½?ä¸ç??ç?¨äº?é??ä»¶æ??é??æ??ä»¶ç??çº¿ç´¢å??è¡¨ã??"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../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
+#: ../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 ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr "å?¨ä¿¡ä»¶ä¸æ??ç´¢æ??å??é??ä»¶ç??çº¿ç´¢å¹¶å?¨æ? é??ä»¶æ?¶è¦å??"
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
@@ -15867,177 +15610,201 @@ msgstr "Evolution æ?¾å?°ä¸?äº?å?³é?®å?è¡¨æ??æ¤ä¿¡ä»¶åº?å½?å??å?«é??ä»¶ï¼?ä½?
 msgid "Message has no attachments"
 msgstr "ä¿¡ä»¶æ? é??ä»¶"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "æ·»å? é??ä»¶(_A)..."
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "ç¼?è¾?ä¿¡ä»¶(_E)"
 
+#: ../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
 #, fuzzy
-#| msgid ""
-#| "A formatter plugin which displays audio attachments inline and allows you "
-#| "to play them directly from evolution."
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"ä¸?ä¸ªæ ¼å¼?å??æ??ä»¶ï¼?è¯¥æ??ä»¶å°?å°±å?°æ?¾ç¤ºé?³é¢?é??ä»¶ï¼?å??è®¸æ?¨ä»? Evolution ä¸ç?´æ?¥æ?æ?¾ã??"
+msgid "Inline Audio"
+msgstr "åµ?å?¥"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "å??åµ?é?³é¢?æ??ä»¶"
+msgid "Play audio attachments directly in mail messages."
+msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:127
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "é??æ?© Evolution å¤?ä»½æ??ä»¶å??ç§°"
 
-#: ../plugins/backup-restore/backup-restore.c:156
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
 msgstr "å¤?ä»½å??é??æ?°å?¯å?¨ Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:179
+#: ../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:203
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
 msgstr "æ?¢å¤?å??é??æ?°å?¯å?¨ Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:276
-msgid "Restore from backup"
-msgstr "ä»?å¤?ä»½ä¸æ?¢å¤?"
-
-#: ../plugins/backup-restore/backup-restore.c:278
+#: ../plugins/backup-restore/backup-restore.c:290
+#, fuzzy
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
 "æ?¨å?¯ä»¥ä»?å¤?ä»½ä¸æ?¢å¤? Evolutionã??å®?è?½å¤?æ?¢å¤?æ??æ??é?®ä»¶ã??æ?¥å??ã??ä»»å?¡ã??å¤?å¿?å??è??ç³»"
 "äººã??\n"
 "å®?è¿?è?½æ?¢å¤?æ?¨ç??æ??æ??ç??ä¸ªäººè®¾ç½®å??é?®ä»¶è¿?æ»¤å?¨ç?ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:284
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "ä»?å¤?ä»½æ??ä»¶ä¸æ?¢å¤? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:291
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "é??æ?©è¦?æ?¢å¤?ç?? Evolution å?æ¡£ï¼?"
 
-#: ../plugins/backup-restore/backup-restore.c:294
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "é??æ?©è¦?æ?¢å¤?ç??æ??ä»¶"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../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
+#, fuzzy
+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
+#, fuzzy
+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:68
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "æ?¢å¤? Evolution ç?®å½?"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "æ£?æ?¥ Evolution å¤?ä»½"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "é??æ?°å?¯å?¨ Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "å¸¦å?¾å½¢ç?¨æ?·ç??é?¢"
 
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "å?³é? Evolution"
 
-#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "å¤?ä»½ Evolution ç??è´¦æ?·å??è®¾ç½®"
 
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "å¤?ä»½ Evolution æ?°æ?®(é?®ä»¶ã??è??ç³»äººã??æ?¥å??ã??ä»»å?¡ã??å¤?å¿?)"
 
-#: ../plugins/backup-restore/backup.c:147
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "å¤?ä»½å®?æ??"
 
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "é??æ?°å?¯å?¨ Evolution"
 
-#: ../plugins/backup-restore/backup.c:262
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "å¤?ä»½å½?å?? Evolution æ?°æ?®"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "ä»?å¤?ä»½ä¸æ??å??æ??ä»¶"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "è£?å?¥ Evolution ç??è®¾ç½®"
 
-#: ../plugins/backup-restore/backup.c:278
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "å? é?¤ä¸´æ?¶å¤?ä»½æ??ä»¶"
 
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "ç¡®ä¿?æ?¬å?°æº?"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ£å?¨å¤?ä»½å?°æ??ä»¶å¤¹ %s"
 
-#: ../plugins/backup-restore/backup.c:460
+#: ../plugins/backup-restore/backup.c:434
 #, 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:479
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Evolution å¤?ä»½"
 
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolution æ?¢å¤?"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "æ£å?¨å¤?ä»½ Evolution æ?°æ?®"
 
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "è¯·ç¨?å??ï¼?Evolution æ£å?¨å¤?ä»½æ?¨ç??æ?°æ?®ã??"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "æ£å?¨æ?¢å¤? Evolution æ?°æ?®"
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "è¯·ç¨?å??ï¼?Evolution æ£å?¨æ?¢å¤?æ?¨ç??æ?°æ?®ã??"
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "è¿?å?¯è?½è¦?è?±ä¸?ç?¹æ?¶é?´ï¼?å??å?³äº?æ?¨å¸?æ?·ä¸ç??æ?°æ?®æ?»é??ã??"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "å¤?ä»½å??æ?¢å¤? Evolution æ?°æ?®å??è®¾ç½®ç??æ??ä»¶ã??"
-
 #. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#, fuzzy
+msgid "Backup and Restore"
 msgstr "å¤?ä»½å??æ?¢å¤?æ??ä»¶"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#, fuzzy
+msgid "Backup and restore your Evolution data and settings."
+msgstr "å¤?ä»½å??æ?¢å¤? Evolution ç??æ?°æ?®å??è®¾ç½®"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "æ?¨ç¡®å®?è¦?å?³é? Evolution å??ï¼?"
@@ -16086,85 +15853,82 @@ msgstr ""
 "å¤?å?ªè?½å?¨ 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:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:670 ../plugins/bbdb/bbdb.c:679
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "è?ªå?¨è??ç³»äºº"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
+#: ../plugins/bbdb/bbdb.c:694
+#, fuzzy
+msgid "Create _address book entries when sending mails"
 msgstr "å??å¤?é?®ä»¶æ?¶è?ªå?¨å?¨å?°å??ç°¿ä¸å??å»ºè??ç³»äººé¡¹(_A)"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:700
 msgid "Select Address book for Automatic Contacts"
 msgstr "é??æ?©è?ªå?¨è??ç³»äººç??å?°å??ç°¿"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Instant Messaging Contacts"
 msgstr "å?³æ?¶é??è®¯è??ç³»äºº"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "å®?æ?¶ä»? Pidgin å¥½å??å??è¡¨ä¸å??æ¥è??ç³»äººä¿¡æ?¯å??å?¾å??"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:736
 msgid "Select Address book for Pidgin buddy list"
 msgstr "é??æ?© Pidgin å¥½å??å??è¡¨ç??å?°å??ç°¿"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:747
 msgid "Synchronize with _buddy list now"
 msgstr "ç«?å?³å??æ¥å¥½å??å??è¡¨(_B)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#, fuzzy
 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 "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
 "å?¨æ?¨å??å¤?é?®ä»¶æ?¶è?ªå?¨ç?¨å§?å??å??ç?µå?é?®ä»¶å?°å??å¡«å?¥æ?¨ç??å?°å??ç°¿ã??å??æ?¶è¿?å°?å¡«å?¥æ?¨å¥½å??å??è¡¨"
 "ç??å?³æ?¶é??è®¯è??ç³»ä¿¡æ?¯ã??"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr ""
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
 #, fuzzy, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "æ??å?°æ?¶å??ç??äº?é??è¯¯"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:179
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:363
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "å°?ä¿¡ä»¶æ??æ?¬è½¬æ?¢ä¸º _Unicode"
 
@@ -16180,151 +15944,187 @@ msgstr ""
 "å°?ä¿¡ä»¶æ??æ?¬è½¬æ?¢å?° Unicode UTF-8 ä»¥ä¸?è?´å??æ?¥è?ªäº?ä¸?å??å?ç¬¦é??ç??å??å?¾ä¿¡ä»¶ç?¹å¾?ã??"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter é??é¡¹"
+#, fuzzy
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter å??å?¾é??é¡¹"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Bogofilter å??å?¾é??é¡¹"
+msgid "Bogofilter Options"
+msgstr "Bogofilter é??é¡¹"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+#, fuzzy
+msgid "Filter junk messages using Bogofilter."
 msgstr "ä½¿ç?¨ Bogofilter è¿?æ»¤å??å?¾ä¿¡ä»¶ã??"
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URLï¼?"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:627
-#: ../plugins/google-account-setup/google-contacts-source.c:311
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "ä½¿ç?¨ _SSL"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:651
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:499
+#: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/google-account-setup/google-source.c:717
 msgid "Re_fresh:"
 msgstr "å?·æ?°(_F)ï¼?"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV æ?¥å??èµ?æº?"
+msgid "Add CalDAV support to Evolution."
+msgstr ""
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
+#, fuzzy
+msgid "CalDAV Support"
 msgstr "CalDAV æº?"
 
+#: ../plugins/calendar-file/calendar-file.c:208
+#, fuzzy
+msgid "_Customize options"
+msgstr "è?ªå®?ä¹?"
+
+#: ../plugins/calendar-file/calendar-file.c:227
+msgid "File _name:"
+msgstr "æ??ä»¶å??(_N)ï¼?"
+
+#: ../plugins/calendar-file/calendar-file.c:231
+#, fuzzy
+msgid "Choose calendar file"
+msgstr "é??æ?©æ??ä»¶"
+
+#: ../plugins/calendar-file/calendar-file.c:279
+#, fuzzy
+msgid "On open"
+msgstr "æ??å¼?"
+
+#: ../plugins/calendar-file/calendar-file.c:280
+msgid "On file change"
+msgstr "å?¨æ??ä»¶æ?¹å??æ?¶"
+
+#: ../plugins/calendar-file/calendar-file.c:281
+#, fuzzy
+msgid "Periodically"
+msgstr "ä¸ªäºº"
+
+#: ../plugins/calendar-file/calendar-file.c:308
+msgid "Force read _only"
+msgstr "å¼ºå?¶å?ªè¯»(_O)"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "è£?å?¥æ?¥å??"
+msgid "Add local calendars to Evolution."
+msgstr "æ·»å? æ?¬å?°æ?¥å??å?° Evolutionã??"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "æ??ä¾?æ?¬å?°æ?¥å??ç??æ ¸å¿?å??è?½ã??"
+msgid "Local Calendars"
+msgstr "è£?å?¥æ?¥å??"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "å®?å?¨è¿?æ?¥(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "ç?¨æ?·å??(_M)ï¼?"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP æ?¥å??"
+msgid "Add web calendars to Evolution."
+msgstr "æ·»å? ç½?ç»?æ?¥å??å?° Evolutionã??"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "æ??ä¾? webcal å?? http æ?¥å??ç??æ ¸å¿?å??è?½ã??"
+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
-#, fuzzy
-#| msgid "Weather: Cloudy"
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
-msgstr "å¤©æ°?ï¼?å¤?äº?"
+msgstr "å¤©æ°?ï¼? å¤?é?´å¤?äº?"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
-#, fuzzy
-#| msgid "Weather: Rain"
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
-msgstr "å¤©æ°?ï¼?é?¨"
+msgstr "å¤©æ°?ï¼? é?´"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
-#, fuzzy
-#| msgid "Weather: Snow"
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
-msgstr "å¤©æ°?ï¼?é?ª"
+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
-#, fuzzy
-#| msgid "Weather Calendars"
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
-msgstr "å¤©æ°?æ??å??"
+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:615
+#: ../plugins/calendar-weather/calendar-weather.c:597
 msgid "_Units:"
 msgstr "å??ä½?(_U)ï¼?"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:604
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å??ç±³ç?ç?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:605
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(å??æ°?ã??è?±å¯¸ç?ç?)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "æ??ä¾?äº?å¤©æ°?æ?¥å??ç??æ ¸å¿?å??è?½ã??"
+msgid "Add weather calendars to Evolution."
+msgstr "æ·»å? å¤©æ°?æ?¥å??å?° Evolutionã??"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "å¤©æ°?æ??å??"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr "ä¸?ä¸ªæµ?è¯?æ??ä»¶ï¼?å®?å°?æ?¾ç¤ºå??è®¸æ?¨å°?æ??å?å¤?å?¶å?°å?ªè´´æ?¿ç??å¼¹å?ºè??å??æ??ä»¶ã??"
+#: ../plugins/contacts-map/contacts-map.c:59
+#: ../plugins/contacts-map/contacts-map.c:193
+#, fuzzy
+msgid "Contacts map"
+msgstr "è??ç³»äººï¼?"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "å¤?å?¶å·¥å?·"
+#: ../plugins/contacts-map/contacts-map.c:60
+#, fuzzy
+msgid "Show a map of all the contacts"
+msgstr "å?¨ä¿¡ä»¶å??è¡¨ä¸?æ?¹æ?¾ç¤ºä¿¡ä»¶é¢?è§?"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr ""
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+#, fuzzy
+msgid "Map for contacts"
+msgstr "æ? è??ç³»äºº"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16336,35 +16136,35 @@ msgid ""
 msgstr "æ¯?æ¬¡å?¯å?¨ Evolution ç??æ?¶å??ï¼?æ£?æ?¥å®?æ?¯å?¦æ?¯é»?è®¤é?®ä»¶ç¨?åº?ã??"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "å?¯å?¨æ?¶æ£?æ?¥ Evolution æ?¯å?¦æ?¯é»?è®¤ç??é?®ä»¶å®¢æ?·ç«¯ã??"
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "å?¨å?¯å?¨æ?¶æ£?æ?¥ Evolution æ?¯ä¸?æ?¯é»?è®¤ç??é?®ä»¶å®¢æ?·ç«¯ã??"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
+msgid "Default Mail Client"
 msgstr "é»?è®¤é?®ä»¶å®¢æ?·ç«¯"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 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:599
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:94
 msgid "Mark as _default address book"
 msgstr "æ ?ä¸ºé»?è®¤å?°å??ç°¿(_D)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:119
+#, fuzzy
+msgid "A_utocomplete with this address book"
+msgstr "å?¨å?°å??ç°¿ä¸æ?¥é??"
+
+#: ../plugins/default-source/default-source.c:138
 msgid "Mark as _default calendar"
 msgstr "æ ?ä¸ºé»?è®¤æ?¥å??(_D)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:139
 msgid "Mark as _default task list"
 msgstr "æ ?ä¸ºé»?è®¤ä»»å?¡å??è¡¨(_D)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:140
 msgid "Mark as _default memo list"
 msgstr "æ ?ä¸ºé»?è®¤å¤?å¿?å??è¡¨(_D)"
 
@@ -16373,44 +16173,9 @@ msgid "Default Sources"
 msgstr "é»?è®¤æº?"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr "æ??ä¾?äº?å°?æ?¥å??æ??å?°å??ç°¿æ ?ä¸ºé»?è®¤æ?¥å??æ??å?°å??ç°¿ç??å??è?½ã??"
-
-#: ../plugins/email-custom-header/email-custom-header.c:560
-msgid "_Custom Header"
-msgstr "è?ªå®?ä¹?ä¿¡å¤´(_C)"
-
-#: ../plugins/email-custom-header/email-custom-header.c:881
-msgid "Key"
-msgstr "é?®"
-
-#: ../plugins/email-custom-header/email-custom-header.c:892
-#: ../plugins/templates/templates.c:396
-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
-msgid ""
-"The format for specifying a Custom Header key value is:\n"
-"Name of the Custom Header key values separated by \";\"."
-msgstr ""
-
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-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
-msgid "Adds custom header to outgoing messages."
+msgid "Mark your preferred address book and calendar as default."
 msgstr ""
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Custom Header"
-msgstr "è?ªå®?ä¹?ä¿¡å¤´"
-
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
 msgstr "è?ªå®?ä¹?ä¿¡å¤´å??è¡¨"
@@ -16422,1033 +16187,216 @@ msgid ""
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 
-#. Translators: '=' and ';' should not be changed but ASCII
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
-msgid ""
-"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
-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:272
-msgid "Out Of Office"
-msgstr "å??å?¬å®¤ä»¥å¤?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
-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:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
-msgid "I am out of the office"
-msgstr "æ??æ£å?¨å??å?¬å®¤å¤?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am in the office"
-msgstr "æ??æ£å?¨å??å?¬å®¤å??"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
-msgid "Change the password for Exchange account"
-msgstr "æ?´æ?¹ Exchange è´¦æ?·ç??å¯?ç ?"
+#: ../plugins/email-custom-header/email-custom-header.c:318
+msgid "Security:"
+msgstr "å®?å?¨ï¼?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "æ?´æ?¹å¯?ç ?"
+#: ../plugins/email-custom-header/email-custom-header.c:323
+msgid "Unclassified"
+msgstr "æ?ªå??ç±»"
 
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
-msgid "Manage the delegate settings for Exchange account"
-msgstr "ç®¡ç?? Exchange è´¦æ?·ç??ä»£ç??è®¾ç½®"
+#: ../plugins/email-custom-header/email-custom-header.c:324
+msgid "Protected"
+msgstr "å??ä¿?æ?¤ç??"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
-msgid "Delegation Assistant"
-msgstr "ä»£ç??å?©æ??"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
-msgid "Miscelleneous"
-msgstr "æ??é¡¹"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
-msgid "View the size of all Exchange folders"
-msgstr "æ?¥ç??æ??æ?? Exchange æ??ä»¶å¤¹ç??å¤§å°?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
-msgid "Folders Size"
-msgstr "æ??ä»¶å¤¹å¤§å°?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "Exchange è®¾ç½®"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
-msgid "_OWA URL:"
-msgstr "_OWA URLï¼?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
-msgid "A_uthenticate"
-msgstr "èº«ä»½éª?è¯?(_U)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "æ??å®?é?®ç®±å??(_P)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
-msgid "_Mailbox:"
-msgstr "é?®ä»¶(_M)ï¼?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
-msgid "_Authentication Type"
-msgstr "èº«ä»½éª?è¯?ç±»å??(_A)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "æ£?æ?¥æ?¯æ??ç??ç±»å??(_E)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 KB"
-
-#: ../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:660
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "æ?¨ç??å¯?ç ?å?³å°?äº? %d å??è¿?æ??"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
-msgid "Custom"
-msgstr "è?ªå®?ä¹?"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "ç¼?è¾?(è¯»å??ã??å??å»ºã??ç¼?è¾?)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "ä½?è??(è¯»å??ã??å??å»º)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "å¤?æ?¥è??(å?ªè¯»)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegate Permissions"
-msgstr "ä»£ç??æ??é??"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
-#, 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:343
-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:348
-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:366
-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:373
-msgid "However you are not permitted to see my private items."
-msgstr "ä½?æ?¯ä½ ä¸?è?½æ?¥ç??æ??ç??ç§?äººé¡¹ç?®ã??"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "æ?¨ç?°å?¨å·²ç»?è¢«æ??æ??ä¸º %s ç??ä»£ç??äºº"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:417
-msgid "Delegate To"
-msgstr "æ??æ??ç»?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:582
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "å? é?¤ä»£ç??äºº %s å??ï¼?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:700
-msgid "Could not access Active Directory"
-msgstr "æ? æ³?è®¿é?® Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:712
-msgid "Could not find self in Active Directory"
-msgstr "æ? æ³?å?¨ Active Directory ä¸æ?¾å?°è?ªå·±"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:725
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "æ? æ³?å?¨ Active Directory ä¸æ?¾å?°ä»£ç??äºº %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:737
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "æ? æ³?å? é?¤ä»£ç??äºº %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:797
-msgid "Could not update list of delegates."
-msgstr "æ? æ³?æ?´æ?°ä»£ç??äººã??"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:815
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "æ? æ³?æ·»å? ä»£ç??äºº %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:983
-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:3
-msgid "C_alendar:"
-msgstr "æ?¥å??(_A)ï¼?"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Co_ntacts:"
-msgstr "è??ç³»äºº(_N)ï¼?"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid "Delegates"
-msgstr "ä»£ç??"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
-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 "è¿?äº?ç?¨æ?·å°?å?¯ä»¥æ??ç?§æ?¨æ??å®?ç??æ??é??ä»¥æ?¨ç??èº«ä»½å??é??é?®ä»¶å¹¶è®¿é?®æ?¨ç??æ??ä»¶å¤¹ã??"
-
-#: ../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
-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:78
-msgid "User"
-msgstr "ç?¨æ?·"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
-#: ../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:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
-msgid "Unsubscribe Folder..."
-msgstr "é??è®¢æ??ä»¶å¤¹..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "ç??ç??è¦?é??è®¢æ??ä»¶å¤¹â??%sâ??å??ï¼?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
-#, 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 "æ?´æ?¹å¯?ç ?(_C)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
-msgid "(Permission denied.)"
-msgstr "(æ??é??è¢«ç¦?æ¢ã??)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
-msgid "Add User:"
-msgstr "æ·»å? ç?¨æ?·ï¼?"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
-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:136
-msgid "Select User"
-msgstr "é??æ?©ç?¨æ?·"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
-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 ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr "ç®¡ç??ä¸?ç»? 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 ""
-
-#: ../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/email-custom-header/email-custom-header.c:326
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Secret"
+msgstr "æ?ºå¯?"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "æ? æ³?è®¤è¯?å?°æ??å?¡å?¨ã??"
+#: ../plugins/email-custom-header/email-custom-header.c:327
+msgid "Top secret"
+msgstr "ç»?å¯?"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "æ? æ³?æ?´æ?¹å¯?ç ?ã??"
+#: ../plugins/email-custom-header/email-custom-header.c:569
+msgid "_Custom Header"
+msgstr "è?ªå®?ä¹?ä¿¡å¤´(_C)"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
 msgstr ""
-"æ? æ³?é??ç½® Exchange è´¦æ?·ï¼?å??å? æ?¯å??ç??äº?æ?ªç?¥é??è¯¯ã??è¯·æ£?æ?¥ URLã??ç?¨æ?·å??ã??å¯?ç ?ï¼?ç?¶å??"
-"å??è¯?ä¸?æ¬¡ã??"
-
-#: ../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 Web å?å?¨ç³»ç»?ã??"
-
-#: ../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 ""
+#: ../plugins/email-custom-header/email-custom-header.c:948
+msgid "Key"
+msgstr "é?®"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "Exchange è´¦æ?·è?±æ?ºã??"
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+msgstr "å?¼"
 
-#: ../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"
-"  "
+#. 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
+msgid "Add custom headers to outgoing mail messages."
 msgstr ""
-"Exchange Connector é??è¦?è®¿é?® Exchange æ??å?¡å?¨ä¸?ç??ç?¹å®?å??è?½ï¼?ä½?å??è?½å·²ç»?è¢«æ? æ??é?´ç¦?"
-"ç?¨æ??å±?è?½ã??æ?¨ç?? Exchange ç®¡ç??å??é??è¦?å?¯ç?¨æ¤å??è?½ï¼?æ??è?½è®©æ?¨ä½¿ç?¨ Ximian "
-"Connectorã??\n"
-"\n"
-"è¦?è?·å¾?æ??ä¾?ç»?æ?¨ Exchange ç®¡ç??å??ç??ä¿¡æ?¯ï¼?è¯·æµ?è§?ä¸?å??é?¾æ?¥ï¼?\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:1269
-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 "ç?¨æ?· {0} å?¨ {1} ä¸?æ²¡æ??é?®ç®±ã??"
-
-#: ../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 "å½?æ?¨é??å?º Evolution æ?¶ï¼?Exchange è´¦æ?·å°?è¢«ç¦?ç?¨"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "å½?æ?¨é??å?º Evolution æ?¶ Exchange è´¦æ?·å°?è¢«å? é?¤"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "è?ªå®?ä¹?ä¿¡å¤´"
 
-#: ../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/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "è?ªå®?ä¹?ä¿¡å¤´"
 
-#: ../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."
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
-"æ??å?¡å?¨æ£å?¨è¿?è¡? Exchange 5.5ã??Exchange Connector å?ªæ?¯æ?? 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."
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:119
+msgid "Automatically launch when a new mail is edited"
 msgstr ""
-"è¿?å?¯è?½æ??å?³ç??æ?¨ç??æ??å?¡å?¨é??è¦?æ?¨å°? Windows å??å??ä½?ä¸ºç?¨æ?·å??ç??ä¸?é?¨å??(å¦?â??DOMAIN"
-"\\userâ??)ã??\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:540
-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 "æ?¨å?³å°?ç?¨å®?æ?¨å?¨æ¤æ??å?¡å?¨ä¸?ç??å?å?¨é?®ä»¶ç??é??é¢?ã??"
-
-#: ../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 "æ?¨å·²ç»?è¶?è¿?äº?å?¨æ¤æ??å?¡å?¨ä¸?å?å?¨é?®ä»¶ç??é??é¢?ã??"
-
-#: ../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/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "é»?è®¤å¤?é?¨ç¼?è¾?å?¨"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "é»?è®¤å?½ä»¤å¿?é¡»ç?¨ä½?ç¼?è¾?å?¨ã??"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#: ../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 ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr "ä¸?ä¸ªä½¿ç?¨å¤?é?¨ç¼?è¾?å?¨ä½?ä¸ºæ?°å??å?¨ç??æ??ä»¶ã??æ?¨å?ªè?½å??é??çº¯æ??æ?¬ä¿¡ä»¶ã??"
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Emacs åº?ä½¿ç?¨â??xemacsâ??\n"
+"VI åº?ä½¿ç?¨â??gvim -fâ??"
 
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+#: ../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 "å¤?é?¨ç¼?è¾?å?¨"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#, fuzzy
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "ä¸?ä¸ªä½¿ç?¨å¤?é?¨ç¼?è¾?å?¨ä½?ä¸ºæ?°å??å?¨ç??æ??ä»¶ã??æ?¨å?ªè?½å??é??çº¯æ??æ?¬ä¿¡ä»¶ã??"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "æ? æ³?å??å»ºä¸´æ?¶ä¿?å?æ??ä»¶"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "ç¼?è¾?å?¨ä¸?å?¯è°?ç?¨"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../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."
 msgstr "Evolution æ? æ³?å??å»ºä¸´æ?¶æ??ä»¶æ?¥ä¿?å?æ?¨ç??é?®ä»¶ã??è¯·ç¨?å??å??è¯?ã??"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+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."
+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 "æ?¨å?¨æ??ä»¶é¦?é??é¡¹ä¸è®¾å®?ç??å¤?é?¨ç¼?è¾?å?¨æ? æ³?è°?ç?¨ï¼?è¯·å°?è¯?è®¾ç½®å?¦å¤?ä¸?ä¸ªç¼?è¾?å?¨ã??"
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "å?¨å¤?é?¨ç¼?è¾?å?¨ä¸å??ä½?(_E)"
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "ä½¿ç?¨å¤?é?¨ç¼?è¾?å?¨å??ä½?ä¿¡ä»¶"
-
-#: ../plugins/external-editor/external-editor.c:112
-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:113
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"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â??"
 
-#: ../plugins/face/face.c:59
-msgid "Select a (48*48) png of size < 700bytes"
+#: ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "æ?ªç?¥ç??é??è¯¯"
+
+#: ../plugins/face/face.c:286
+#, fuzzy
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "é??æ?©ä¸?ä¸ªå°?äº? 700B ç?? 48*48 ç?? PNG å?¾å??"
 
-#: ../plugins/face/face.c:69
-msgid "PNG files"
-msgstr "PNG æ??ä»¶"
+#: ../plugins/face/face.c:296
+msgid "Image files"
+msgstr "å?¾å??æ??ä»¶"
 
-#: ../plugins/face/face.c:126
-msgid "_Face"
-msgstr "å¤´å??(_F)"
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr ""
+
+#: ../plugins/face/face.c:415
+#, fuzzy
+msgid "Include _Face"
+msgstr "å??å?«ï¼?"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+msgid "Attach a small picture of your face to outgoing messages."
 msgstr ""
-"å?¨å??å?ºç??é?®ä»¶ç??é?®ä»¶å¤´ä¸é??ä¸?å¤´å??ã??ç¬¬ä¸?æ¬¡ä½¿ç?¨æ?¶ç?¨æ?·é??è¦?é??ç½®ä¸?ä¸ª 48*48 ç?? PNG å?¾"
-"è±¡ã??å®?ä»¥ base64 ç¼?ç ?å¹¶ä¿?å?å?¨ ~/.evolution/faces ä¸?ã??è¿?å°?å?¨ä»¥å??å??å?ºç??é?®ä»¶ä¸ä½¿"
-"ç?¨ã??"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "æ? æ³?é??è®¢æ??ä»¶å¤¹â??%sâ??"
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+#, fuzzy
+msgid "Failed Read"
+msgstr "è¡¨å¤´"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "å??è®¸å?¨ä¾§è¾¹æ ?ç??å¿«æ?·è??å??ä¸é??è®¢é?®ä»¶æ??ä»¶å¤¹ã??"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+#, fuzzy
+msgid "Invalid Image Size"
+msgstr "æ? æ??ç??æ?¥æ??å?¼"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe Folders"
-msgstr "é??è®¢æ??ä»¶å¤¹"
+#: ../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
+#, fuzzy
+msgid "Please select an image of size 48 * 48"
+msgstr "è¯·é??æ?©æ¤è??ç³»äººç??å?¾å??"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "è¿?ä¸ªæ??ä»¶ä¸?è?½è¢«è¯»å??"
 
-#: ../plugins/google-account-setup/google-source.c:83
-#: ../plugins/google-account-setup/google-source.c:90
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-contacts-source.c:58
-#: ../plugins/google-account-setup/google-contacts-source.c:84
+#: ../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 ""
+
+#: ../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:440
+#: ../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:540
+#: ../plugins/google-account-setup/google-source.c:623
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17457,41 +16405,67 @@ msgstr ""
 "æ? æ³?ä»? Google æ??å?¡å?¨ä¸?è¯»å??æ?°æ?®ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:702
+#: ../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:943
+msgid "Unknown error."
+msgstr "æ?ªç?¥é??è¯¯ã??"
+
+#: ../plugins/google-account-setup/google-source.c:758
 msgid "Cal_endar:"
 msgstr "æ?¥å??(_E)ï¼?"
 
-#: ../plugins/google-account-setup/google-source.c:737
+#: ../plugins/google-account-setup/google-source.c:793
 msgid "Retrieve _list"
 msgstr "è?·å??å??è¡¨(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:278
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
-msgid "<b>Server</b>"
-msgstr "<b>æ??å?¡å?¨</b>"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "è®¾ç½® Google æ?¥å??å??è??ç³»äººç??æ??ä»¶ã??"
+msgid "Add Google Calendars to Evolution."
+msgstr ""
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Google æº?"
+msgid "Google Calendars"
+msgstr "Google æ?¥å??"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-features/camel-gw-listener.c:451
 msgid "Checklist"
 msgstr "å¾?å??æ¸?å??"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "è®¾ç½® GroupWise æ?¥å??å??è??ç³»äººæº?ç??æ??ä»¶ã??"
+#: ../plugins/groupwise-features/gw-ui.c:111
+msgid "New _Shared Folder..."
+msgstr "æ?°å»ºå?±äº«æ??ä»¶å¤¹(_S)..."
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "GroupWise è´¦æ?·è®¾ç½®"
+#: ../plugins/groupwise-features/gw-ui.c:118
+msgid "_Proxy Login..."
+msgstr "ä»£ç??æ??å?¡å?¨ç?»å½?(_P)..."
 
-#: ../plugins/groupwise-features/install-shared.c:220
-#, c-format
+#: ../plugins/groupwise-features/gw-ui.c:169
+msgid "Junk Mail Settings..."
+msgstr "å??å?¾é?®ä»¶è®¾ç½®..."
+
+#: ../plugins/groupwise-features/gw-ui.c:176
+msgid "Track Message Status..."
+msgstr "è·?è¸ªä¿¡ä»¶ç?¶æ??..."
+
+#: ../plugins/groupwise-features/gw-ui.c:182
+msgid "Retract Mail"
+msgstr "æ?¶å??é?®ä»¶"
+
+#: ../plugins/groupwise-features/gw-ui.c:339
+msgid "Accept Tentatively"
+msgstr "æ??æ?¶æ?¥å??"
+
+#: ../plugins/groupwise-features/gw-ui.c:353
+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
+#, fuzzy, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -17501,7 +16475,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"
@@ -17515,278 +16489,285 @@ msgstr ""
 "å??å?»â??å??è¿?â??å?¯å®?è£?å?±äº«æ??ä»¶å¤¹\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "å®?è£?å?±äº«æ??ä»¶å¤¹"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../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:82
 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:95
+#: ../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:484
 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:53
-#, fuzzy
+#: ../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:83
 msgid "Message Retract"
-msgstr "ä¿¡ä»¶ç?¶æ??"
+msgstr "ä¿¡æ?¯æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:88
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 msgstr ""
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:109
 msgid "Message retracted successfully"
 msgstr "é?®ä»¶æ??å??æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
-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
-#, fuzzy
-#| msgid "Add Send Options to groupwise messages"
 msgid "Add Send Options to GroupWise messages"
-msgstr "å°?å??é??é??é¡¹æ·»å? å?° GroupWise ä¿¡ä»¶"
+msgstr "ä¸º GroupWise ä¿¡æ?¯æ·»å? å??é??é??é¡¹"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-#, fuzzy
-#| msgid "A plugin for the features in Groupwise accounts."
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "Groupwise è´¦æ?·ç?¹æ?§ç??æ??ä»¶ã??"
+msgid "Fine-tune your GroupWise accounts."
+msgstr "è°?æ?´æ?¨ç?? GroupWise å¸?æ?·ã??"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-#, fuzzy
-#| msgid "Groupwise Features"
 msgid "GroupWise Features"
-msgstr "Groupwise ç?¹æ?§"
+msgstr "GroupWise ç?¹æ?§"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "é?®ä»¶æ?¶å??å¤±è´¥"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 #, fuzzy
 msgid "The server did not allow the selected message to be retracted."
 msgstr "å°?é??ä¸é?®ä»¶è½¬æ?¢ä¸ºæ?°ä»»å?¡"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+#, fuzzy
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "å·²ç»?å?å?¨å??ä¸ºâ??{0}â??ç??æ??ä»¶å¤¹ã??è¯·ä½¿ç?¨ä¸?å??ç??å??ç§°ã??"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "å¸?æ?·å·²ç»?å?å?¨"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "æ? æ??ç?¨æ?·"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+
 #. 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-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 #, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "æ? æ³?ä¿?å?å?°æ??ä»¶â??{0}â??ã??"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "æ??å®?ç?¨æ?·"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 #, fuzzy
 msgid "You have already given proxy permissions to this user."
 msgstr "ä½ å?¨æ??ç??æ??ä»¶å¤¹ä¸?æ?¥æ??ä¸?å??æ??é??ï¼?"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 #, fuzzy
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "å·²ç»?å?å?¨å??ä¸ºâ??{0}â??ç??æ??ä»¶å¤¹ã??è¯·ä½¿ç?¨ä¸?å??ç??å??ç§°ã??"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "å¸?æ?·å·²ç»?å?å?¨"
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "æ? æ³?ä¿?å?å?°è?ªå?¨ä¿?å?æ??ä»¶â??{0}â??ã??"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#, fuzzy
+msgid "Do you want to resend the meeting?"
+msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤è¯¥ä¼?è®®å??ï¼?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#, fuzzy
+msgid "Do you want to resend the recurring meeting?"
+msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤è¯¥ä¼?è®®å??ï¼?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#, fuzzy
+msgid "Do you want to retract the original item?"
+msgstr "æ?¨æ?¯å?¦æ?³è¦?æ?¢å¤?æ?ªå®?æ??ç??ä¿¡ä»¶ï¼?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#, fuzzy
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "ä»?å?¨é?¨å?¶å®?æ?¶ä»¶äººç??é?®ç®±ä¸å? é?¤æ¤é¡¹å??ï¼?(_D)"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 #, fuzzy
 msgid "This is a recurring meeting"
 msgstr "å°?æ¤äº?ä»¶æ ?ä¸ºé??å¤?å??ç??"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 #, fuzzy
 msgid "Would you like to accept it?"
 msgstr "æ?¨å¸?æ??ä¿?å?æ?´æ?¹å??ï¼?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 #, fuzzy
 msgid "Would you like to decline it?"
 msgstr "æ?¨å¸?æ??ä¿?å?æ?´æ?¹å??ï¼?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-#, fuzzy
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "æ? æ³?ä¿?å?å?°è?ªå?¨ä¿?å?æ??ä»¶â??{0}â??ã??"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr ""
-
-#: ../plugins/groupwise-features/process-meeting.c:52
-msgid "Accept Tentatively"
-msgstr "æ??æ?¶æ?¥å??"
-
-#: ../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:516
+#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:512
 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:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
+#: ../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:510
-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:692
 msgid "The Proxy tab will be available only when the account is online."
@@ -17797,125 +16778,121 @@ msgstr "ä»£ç??æ??å?¡å?¨æ ?ç¾ä»?å½?è´¦æ?·è??æ?ºæ?¶æ??å?¯ç?¨ã??"
 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:702
+msgid "Add User"
+msgstr "æ·»å? ç?¨æ?·"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "é«?çº§å??é??é??é¡¹"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:737
 msgid "Users"
 msgstr "ç?¨æ?·"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "è¾?å?¥ç?¨æ?·å??è®¾å®?æ??é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
-msgid "New _Shared Folder..."
-msgstr "æ?°å»ºå?±äº«æ??ä»¶å¤¹(_S)..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "å?±äº«"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "è?ªå®?ä¹?é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:742
 msgid "Add   "
 msgstr "æ·»å? "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Modify"
 msgstr "ä¿®æ?¹"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "ä¿¡ä»¶ç?¶æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "ä¸»é¢?ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "å??ä»¶äººï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "å??å»ºæ?¥æ??ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Recipient: "
 msgstr "æ?¶ä»¶äººï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Delivered: "
 msgstr "å·²æ??é??ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:220
 msgid "Opened: "
 msgstr "å·²æ??å¼?ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:225
 msgid "Accepted: "
 msgstr "å·²æ?¥å??ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:230
 msgid "Deleted: "
 msgstr "å·²å? é?¤ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:235
 msgid "Declined: "
 msgstr "å·²æ??ç»?ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:240
 msgid "Completed: "
 msgstr "å·²å®?æ??ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:245
 msgid "Undelivered: "
 msgstr "æ?ªæ??é??ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Track Message Status..."
-msgstr "è·?è¸ªä¿¡ä»¶ç?¶æ??..."
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "è®¾ç½® Hula æ?¥å??æº?ç??æ??ä»¶ã??"
+msgid "Add Hula support to Evolution."
+msgstr ""
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Hula è´¦æ?·è®¾ç½®"
+msgid "Hula Support"
+msgstr "Hula æ?¯æ??"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+#, fuzzy
+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:320
+#: ../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:333
+#: ../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 "å?ºæ?¬å??é?®ä»¶å??è¡¨ä¿¡å¤´(é»?è®¤)(_M)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "è?·å??å?¨é?¨ä¿¡å¤´(_L)"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
+#: ../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"
@@ -17924,7 +16901,7 @@ msgstr ""
 "é?¤äº?ä»¥ä¸?ç??æ ?å??ä¿¡å¤´ä¹?å¤?ï¼?å?¨æ¤ç»?å?ºæ?³è¦?è?·å??ç??é¢?å¤?ä¿¡å¤´ã??\n"
 "å¦?æ??æ?¨é??æ?©ç??æ?¯â??å?¨é?¨ä¿¡å¤´â??ç??è¯?ï¼?å?¯ä»¥å¿½ç?¥æ¤é¡¹ã??"
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../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."
@@ -17932,7 +16909,7 @@ msgstr ""
 "é??æ?©æ?¨ç?? IMAP ä¿¡å¤´é¦?é??é¡¹ã??\n"
 "æ?¨æ??é??æ?©ç??ä¿¡å¤´è¶?å¤?ï¼?ä¸?è½½æ??è?±è´¹ç??æ?¶é?´è¶?é?¿ã??"
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../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"
@@ -17940,741 +16917,687 @@ msgstr ""
 "å?ºæ?¬ä¿¡å¤´ - (æ??å¿«)(_B)\n"
 "å¦?æ??æ?¨æ²¡æ??å?ºäº?é?®ä»¶å??è¡¨ç??è¿?æ»¤å?¨ï¼?è¯·é??æ?©æ¤é¡¹"
 
+#: ../plugins/imap-features/imap-headers.ui.h:10
+#, fuzzy
+msgid "_Fetch All Headers"
+msgstr "è?·å??å?¨é?¨ä¿¡å¤´(_L)"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "å®?ç?° IMAP è´¦æ?·ç?¹æ?§ç??æ??ä»¶ã??"
+msgid "Fine-tune your IMAP accounts."
+msgstr "è°?æ?´æ?¨ç?? IMAP è´¦æ?·ã??"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP ç?¹æ?§"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "å¯¼å?¥å?°æ?¥å??(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "å¯¼å?¥å?°ä»»å?¡(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "å¯¼å?¥ ICS"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "é??æ?©ä»»å?¡å??è¡¨"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "é??æ?©æ?¥å??"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "å¯¼å?¥(_I)"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "å¯¼å?¥å?°æ?¥å??"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "å°? ICS é??ä»¶å¯¼å?¥å?°æ?¥å??ã??"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "ç¡¬ä»¶æ?½è±¡å±?(HAL)å°?æ?ªå? è½½"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
-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:83
-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ã??æ?¨å?¯è?½æ²¡æ??å°?å?¶è¿?æ?¥å?°ç³»ç»?ï¼?æ??è??æ²¡æ??å¼?æ?ºã??"
-
-#: ../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 the selected task/memo/calendar/address book with Apple iPod"
-msgstr "å°?é??ä¸ç??ä»»å?¡/å¤?å¿?/æ?¥å??/å?°å??ç°¿ä¸? Apple iPod å??æ¥"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "å??æ¥å?° iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "iPod å??æ¥"
-
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../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:626
+#: ../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:662
+#: ../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:752
+#: ../plugins/itip-formatter/itip-formatter.c:774
 msgid "Unable to find any calendars"
 msgstr "æ? æ³?æ?¾å?°ä»»ä½?æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:781
 msgid "Unable to find this meeting in any calendar"
 msgstr "æ? æ³?å?¨ä»»ä½?æ?¥å??ä¸æ?¾å?°æ¤ä¼?è®®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:785
 msgid "Unable to find this task in any task list"
 msgstr "æ? æ³?å?¨ä»»ä½?ä»»å?¡å??è¡¨ä¸æ?¾å?°æ¤ä»»å?¡"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find this memo in any memo list"
 msgstr "æ? æ³?å?¨ä»»ä½?å¤?å¿?å??è¡¨ä¸æ?¾å?°æ¤å¤?å¿?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:860
+#, fuzzy
+msgid "Opening the calendar. Please wait.."
+msgstr "æ??å¼?æ?¥å??"
+
+#: ../plugins/itip-formatter/itip-formatter.c:863
 msgid "Searching for an existing version of this appointment"
 msgstr "æ??ç´¢æ¤çº¦ä¼?ç??å·²æ??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1045
 msgid "Unable to parse item"
 msgstr "æ? æ³?å??æ??é¡¹ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "æ? æ³?å°?é¡¹ç?®å??é??å?°æ?¥å??â??%sâ??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å°?æ?¥å??â??%sâ??å??é??ä¸ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1148
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å°?æ?¥å??â??%sâ??å??é??ä¸ºå¾?å®?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å°?æ?¥å??â??%sâ??å??é??ä¸ºå·²æ??ç»?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1158
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å°?æ?¥å??â??%sâ??å??é??ä¸ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1252
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ç»?ç»?è??å·²ç»?å? é?¤äº?ä»£ç??äºº %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1259
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å·²ç»?ä»£ç??äººå??é??äº?å??æ¶?é??ç?¥"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1261
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "æ? æ³?ç»?ä»£ç??äººå??é??å??æ¶?é??ç?¥"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1372
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "å?ºå¸è??ç?¶æ??æ? æ³?æ?´æ?°ï¼?å??å? æ?¯ç?¶æ??æ? æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "æ? æ³?æ?´æ?°å?ºå¸è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1405
 msgid "Attendee status updated"
 msgstr "å?ºå¸è??ç?¶æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 msgid "Meeting information sent"
 msgstr "ä¼?è®®ä¿¡æ?¯å·²å??é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1434
 msgid "Task information sent"
 msgstr "ä»»å?¡ä¿¡æ?¯å·²å??é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1437
 msgid "Memo information sent"
 msgstr "å¤?å¿?ä¿¡æ?¯å·²å??é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "æ? æ³?å??é??ä¼?è®®ä¿¡æ?¯ï¼?ä¼?è®®ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "Unable to send task information, the task does not exist"
 msgstr "æ? æ³?å??é??ä»»å?¡ä¿¡æ?¯ï¼?ä»»å?¡ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1452
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "æ? æ³?å??é??å¤?å¿?ä¿¡æ?¯ï¼?å¤?å¿?ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1517
+msgid "calendar.ics"
+msgstr "calendar.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1522
+msgid "Save Calendar"
+msgstr "ä¿?å?æ?¥å??"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "The calendar attached is not valid"
 msgstr "é??å? ç??æ?¥å??æ? æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1587
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ä¿¡ä»¶å£°æ??å?¶å??å?«æ?¥å??ï¼?ä½?æ?¥å??ä¸?æ?¯æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1627
+#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid "The item in the calendar is not valid"
 msgstr "æ?¥å??é¡¹æ? æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 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:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??æ?¥å??å??å?«å¤?ä¸ªé¡¹ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "è¦?å¤?ç??è¿?äº?å?¨é?¨é¡¹ç?®ï¼?åº?è¯¥ä¿?å?æ??ä»¶å¹¶å¯¼å?¥æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2434
 msgid "This meeting recurs"
 msgstr "æ¤ä¼?è®®é??ç?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2437
 msgid "This task recurs"
 msgstr "æ¤ä»»å?¡é??ç?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../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:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2670
 msgid "_Delete message after acting"
 msgstr "æ??ä½?å??å? é?¤æ¶?æ?¯(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2680
+#: ../plugins/itip-formatter/itip-formatter.c:2713
 msgid "Conflict Search"
 msgstr "å?²çª?æ??ç´¢"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2695
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é??æ?©è¦?æ??ç´¢å?²çª?ä¼?è®®ç??æ?¥å??"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-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:199
 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:203
 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:212
 msgid "Today %l:%M:%S %p"
 msgstr "ä»?å¤©%p%l:%M:%S"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "æ??å¤©"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:227
 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:231
 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:236
 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:240
 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:259
 #, 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:264
 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:268
 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:273
 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:277
 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:286
 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:292
 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:296
 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:301
 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:305
 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:311
 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:316
 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:320
 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:325
 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:329
 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:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../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:356
+#: ../plugins/itip-formatter/itip-view.c:444
+#: ../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:361
 #, 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:363
 #, 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:368
 #, 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:371
 #, 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:373
 #, 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:379
 #, 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:381
 #, 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:385
 #, c-format
 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:387
 #, c-format
 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:391
 #, 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:393
 #, 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:397
 #, 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:399
 #, 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:403
 #, 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:405
 #, 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:409
 #, 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:411
 #, 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:449
 #, 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:451
 #, 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:456
 #, 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:459
 #, 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:461
 #, 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:467
 #, 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:469
 #, 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:473
 #, c-format
 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:475
 #, c-format
 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:479
 #, c-format
 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:481
 #, 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:485
 #, 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:487
 #, 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:491
 #, c-format
 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:493
 #, 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:497
 #, 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:499
 #, 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:820
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "æ??å¼?æ?¥å??(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../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:827
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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:830
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "å?¨é?¨æ??ç»?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "å?¨é?¨å¾?å®?(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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:832
+#: ../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:843
+#: ../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:847
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "æ?´æ?°ä¸?ä¼?è??ç?¶æ??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1026
-msgid "Start time:"
-msgstr "å¼?å§?æ?¶é?´ï¼?"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1035
-msgid "End time:"
-msgstr "ç»?æ??æ?¶é?´ï¼?"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1051
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:1126
 msgid "Comment:"
 msgstr "æ³¨é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Send _reply to sender"
 msgstr "å??å¤?å??ä»¶äºº(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1141
 msgid "Send _updates to attendees"
 msgstr "ç»?å?ºå¸è??å??é??æ?´æ?°(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1150
 msgid "_Apply to all instances"
 msgstr "åº?ç?¨å?°å?¨é?¨å®?ä¾?(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1159
 msgid "Show time as _free"
 msgstr "å°?æ?¶é?´æ?¾ç¤ºä¸ºç©ºé?²(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1136
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Preserve my reminder"
 msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 
-#: ../plugins/itip-formatter/itip-view.c:1141
-#, fuzzy
-#| msgid "Attachment Reminder"
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1168
 msgid "_Inherit reminder"
-msgstr "é??ä»¶æ??é??"
+msgstr "ç»§æ?¿æ??ç¤º(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1895
-msgid "_Tasks :"
+#: ../plugins/itip-formatter/itip-view.c:1930
+msgid "_Tasks:"
 msgstr "ä»»å?¡(_T)ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:1897
-msgid "Memos :"
-msgstr "å¤?å¿?ï¼?"
+#: ../plugins/itip-formatter/itip-view.c:1932
+msgid "_Memos:"
+msgstr "å¤?å¿?(_M)ï¼?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "æ?¾ç¤ºä¿¡ä»¶ç?? text/calendar é?¨å??ã??"
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "å?¨é?®ä»¶ä¿¡æ?¯ç?? MIME é?¨å??æ?¾ç¤ºâ??æ??æ?¬/æ?¥å??â??ã??"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -18695,18 +17618,6 @@ 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 "Allows disabling of accounts."
-msgstr "å??è®¸ç¦?ç?¨è´¦æ?·ã??"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable Account"
-msgstr "ç¦?ç?¨è´¦æ?·"
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "å??å?ºå??ç??ä¸?å£°æ??æ?æ?¾å£°é?³æ??ä»¶ã??"
@@ -18742,51 +17653,56 @@ msgid "Play sound when new messages arrive."
 msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶æ?æ?¾å£°é?³ã??"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#, fuzzy
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "ä¸?å?¨ beep æ¨¡å¼?ä¸?æ?¶æ?°é?®ä»¶å?°è¾¾è¦?æ?æ?¾ç??å£°é?³æ??ä»¶ã??"
+
+#: ../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 "ä¸?å?¨ beep æ¨¡å¼?ä¸?æ?¶æ?°é?®ä»¶å?°è¾¾è¦?æ?æ?¾ç??å£°é?³æ??ä»¶ã??"
 
-#: ../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:256
-msgid "Generate a _D-Bus message"
-msgstr "ç??æ?? _D-Bus æ¶?æ?¯"
-
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
 msgstr "Evolution é?®ä»¶é??ç?¥"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../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:479
+#. 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"
@@ -18796,149 +17712,289 @@ msgid_plural ""
 "in %s."
 msgstr[0] "æ?¨å?¨ %2$s ä¸æ?¶å?°äº? %1$d å°?æ?°é?®ä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#. 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 å°?æ?°é?®ä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "New email"
 msgstr "æ?°ç?µå?é?®ä»¶"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:602
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å?ºæ?¾ç¤ºå?¾æ ?(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:630
 msgid "B_link icon in notification area"
 msgstr "é?ªç??é??ç?¥å?ºå?¾æ ?(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:640
 msgid "Popup _message together with the icon"
 msgstr "å??æ?¶å¼¹å?ºå?¾æ ?å??æ¶?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:825
 msgid "_Play sound when new messages arrive"
 msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶æ?æ?¾å£°é?³(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:854
 msgid "_Beep"
 msgstr "å??é??(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:759
-msgid "Play _sound file"
-msgstr "æ?æ?¾å£°é?³æ??ä»¶(_S)"
+#: ../plugins/mail-notification/mail-notification.c:867
+msgid "Use sound _theme"
+msgstr "ä½¿ç?¨å£°é?³ä¸»é¢?(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:770
-msgid "Specify _filename:"
-msgstr "æ??å®?æ??ä»¶å??(_F)ï¼?"
+#: ../plugins/mail-notification/mail-notification.c:886
+msgid "Play _file:"
+msgstr "æ?æ?¾æ??ä»¶(_F)ï¼?"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:897
 msgid "Select sound file"
 msgstr "é??æ?©å£°é?³æ??ä»¶"
 
-#: ../plugins/mail-notification/mail-notification.c:772
-msgid "Pl_ay"
-msgstr "æ?æ?¾(_A)"
-
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:955
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_I)"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
-msgstr "å½?æ?°é?®ä»¶å?°è¾¾æ?¶ä½¿ç?¨é??ç?¥å?ºå?¾æ ?å??é??ç?¥æ¶?æ?¯é??ç?¥ç?¨æ?·æ??ç??æ??ä¸?æ?¡ D-Bus æ¶?æ?¯ã??"
+#: ../plugins/mail-notification/mail-notification.c:964
+msgid "Generate a _D-Bus message"
+msgstr "ç??æ?? _D-Bus æ¶?æ?¯"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "é?®ä»¶é??ç?¥"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "å½?æ?°ç??é?®ä»¶ä¿¡æ?¯å?°è¾¾æ?¶æ??ç¤ºæ?¨ã??"
+
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
+#: ../plugins/mail-to-task/mail-to-task.c:166
+#, c-format
+msgid "Created from a mail by %s"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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?"
+msgstr ""
+
+#: ../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?"
+msgstr ""
+
+#: ../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:522
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "å??è®¸æ ¹æ?®é?®ä»¶å??å®¹å??å»ºä¼?è®®ç??æ??ä»¶ã??"
+"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: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-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "è½¬æ?¢ä¸ºä¼?è®®(_V)"
+#: ../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] ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "é?®å¯?å?°ä¼?è®®"
+#: ../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] ""
+
+#: ../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] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:614
+msgid "[No Summary]"
+msgstr "[æ²¡æ??æ¦?è¦?]"
+
+#: ../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:696
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "å?¨å¤?ç??æ?¶å?ºç?°äº?ä¸?ä¸ªé??è¯¯ï¼?%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../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:292
+#: ../plugins/mail-to-task/mail-to-task.c:732
+#, fuzzy
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr "é??ä¸ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ¤ä¸?è?½å?¨æ¤å??å»ºä»»å?¡ã??è¯·é??æ?©å?¶å®?ç??æº?ã??"
+
+#: ../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/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:738
+#, fuzzy
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr "å??è®¸æ ¹æ?®é?®ä»¶å??å®¹å??å»ºä»»å?¡ç??æ??ä»¶ã??"
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+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 "Con_vert to Task"
-msgstr "è½¬æ?¢ä¸ºä»»å?¡(_V)"
+#: ../plugins/mail-to-task/mail-to-task.c:943
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "è?½è?·å??æº?å??è¡¨ã?? %s"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "é?®å¯?å?°ä»»å?¡"
+#: ../plugins/mail-to-task/mail-to-task.c:1062
+msgid "Create an _Event"
+msgstr "å??å»ºä¸?ä¸ªäº?ä»¶(_E)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "å°?é??ä¸é?®ä»¶è½¬æ?¢ä¸ºæ?°ä»»å?¡"
+#: ../plugins/mail-to-task/mail-to-task.c:1064
+msgid "Create a new event 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:1069
+msgid "Create a Mem_o"
+msgstr "å??å»ºä¸?ä¸ªå¤?å¿?(_O)"
 
-#: ../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:1071
+msgid "Create a new memo from the selected message"
+msgstr "ç?¨æ??é??é?®ä»¶å??å»ºæ?°å¤?å¿?"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1076
+msgid "Create a _Task"
+msgstr "å??å»ºä¸?ä¸ªä»»å?¡(_T)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1078
+msgid "Create a new task from the selected message"
+msgstr "ç?¨æ??é??é?®ä»¶å??å»ºæ?°ä»»å?¡"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1086
+msgid "Create a _Meeting"
+msgstr "å??å»ºä¸?ä¸ªä¼?è®®(_M)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1088
+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:277
+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:279
+msgid "Get an archive of the list this message belongs to"
+msgstr "è?·å??è¿?å°?ä¿¡æ??å±?é?®ä»¶å??è¡¨ç??å?æ¡£"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:284
+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:286
+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:291
+msgid "Contact List _Owner"
+msgstr "è??ç³»å??è¡¨æ??æ??è??(_O)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr "æ??ä¾?é?®ä»¶å??è¡¨å?¬å?±å?½ä»¤ç??å?¨ä½?(è®¢é??ã??é??è®¢ç?ç?)ã??"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+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:298
+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:300
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "ç»?è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??è¡¨æ??é??"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
+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:307
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "è®¢é??è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??è¡¨"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
+msgid "_Unsubscribe from List"
 msgstr "é??è®¢å??è¡¨(_U)"
 
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#, fuzzy
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "é??è®¢è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??è¡¨"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+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 "æ²¡æ??å?¯ç?¨ç??å?¨ä½?"
@@ -18980,11 +18036,6 @@ msgstr "æ??ä¿¡ä»¶å??é??å?°é?®ä»¶å??è¡¨å??ï¼?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 #, fuzzy
-#| msgid ""
-#| "The action could not be performed. This means the header for this action "
-#| "did not contain any action we could process.\n"
-#| "\n"
-#| "Header: {0}"
 msgid ""
 "The action could not be performed. The header for this action did not "
 "contain any action that could be processed.\n"
@@ -19019,164 +18070,119 @@ 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
+#: ../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:164
-msgid "Current Folder and _Subfolders"
-msgstr "å½?å??æ??ä»¶å¤¹å??å?¶å?æ??ä»¶å¤¹ä¸(_S)"
+#: ../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:185
+msgid "In Current _Folder Only"
+msgstr "å?ªå?¨å½?å??æ??ä»¶å¤¹(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "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 "Used for marking all the messages under a folder as read"
-msgstr "ç?¨äº?å°?æ??ä»¶å¤¹å??ç??å?¨é?¨ä¿¡ä»¶å?¨é?¨æ ?ä¸ºå·²è¯»"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "å®?ç?° mono æ??ä»¶ç??æ??ä»¶ã??"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Mono Loader"
-msgstr "Mono è£?å?¥å?¨"
+#, fuzzy
+msgid "Mark all messages in a folder as read."
+msgstr "å°?æ¤æ??ä»¶å¤¹ä¸ç??æ??æ??ä¿¡ä»¶æ ?è®°ä¸ºå·²è¯»"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "ç®¡ç??æ??ä»¶æ?¯å?¯ç?¨è¿?æ?¯ç¦?ç?¨ç??æ??ä»¶ã??"
+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/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"ä¸?ä¸ªæµ?è¯?æ??ä»¶ï¼?å®?æ¼?ç¤ºäº?å?¯è®©æ?¨ç¦?ç?¨ HTML é?®ä»¶ç??æ ¼å¼?å??æ??ä»¶ã??\n"
-"\n"
-"æ¤æ??ä»¶å?ªæ?¯ä¸?ä¸ªä¸?æ??ä¾?ä»»ä½?æ??æ?¯æ?¯æ??ç??æ¼?ç¤ºè??å·²ã??\n"
+#: ../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:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "çº¯æ??å?æ¨¡å¼?"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
 msgstr "é¦?é??çº¯æ??æ?¬"
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "ä½?ä¸ºçº¯æ??æ?¬æ?¥æ?¥ç??é?®ä»¶ä¿¡æ?¯ï¼?ç??è?³å?¨å®?ä»¬å??å?« HTML å??å®¹æ?¶ã??"
+
+#: ../plugins/prefer-plain/prefer-plain.c: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 ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:202
+#, fuzzy
+msgid "Show plain text if present"
+msgstr "é¦?é?? HTML"
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+#, fuzzy
+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 ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "HT_ML æ¨¡å¼?"
 
@@ -19185,8 +18191,8 @@ msgid "Evolution Profiler"
 msgstr "Evolution é??ç½®å?¨"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "ç¼?å??é??ç½®æ?°æ?®äº?ä»¶ç??æ?¥å¿?ã??"
+msgid "Profile data events in Evolution (for developers only)."
+msgstr ""
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19200,365 +18206,381 @@ msgstr "Outlook PST å¯¼å?¥"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ä¸ªäººæ??ä»¶å¤¹(.pst)"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "å??è®¸å°?æ?¥å??å??å¸?å?° Web"
+#: ../plugins/pst-import/pst-importer.c:299
+msgid "_Mail"
+msgstr "é?®ä»¶(_M)"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:317
+msgid "_Address Book"
+msgstr "å?°å??ç°¿(_A)"
+
+#. Appointments
+#: ../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:336
+#, fuzzy
+msgid "_Journal entries"
+msgstr "æ?¥è®°"
+
+#: ../plugins/pst-import/pst-importer.c:351
+#, fuzzy
+msgid "Importing Outlook data"
+msgstr "å¯¼å?¥ Elm æ?°æ?®"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Calendar Publishing"
 msgstr "æ?¥å??å??å¸?"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "ä½?ç½®"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "å??å¸?æ?¥å??ä¿¡æ?¯(_P)"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Publish calendars to the web."
+msgstr "å??è®¸å°?æ?¥å??å??å¸?å?° Web"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:94
+#: ../plugins/publish-calendar/publish-calendar.c:336
+#, c-format
+msgid "Could not open %s:"
+msgstr "æ? æ³?æ??å¼? %sï¼?"
+
+#: ../plugins/publish-calendar/publish-calendar.c:96
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "æ? æ³?æ??å¼? %sï¼?æ?ªç?¥é??è¯¯"
+
+#: ../plugins/publish-calendar/publish-calendar.c:116
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:118
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:163
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "å? è½½ %s å¤±è´¥ï¼?"
+
+#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "å?¯ç?¨(_N)"
+
+#: ../plugins/publish-calendar/publish-calendar.c:629
 msgid "Are you sure you want to remove this location?"
 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:939
+#, fuzzy
+msgid "Could not create publish thread."
+msgstr "æ? æ³?å??å»ºä¿¡ä»¶ã??"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">æº?</span>"
+#: ../plugins/publish-calendar/publish-calendar.c:946
+msgid "_Publish Calendar Information"
+msgstr "å??å¸?æ?¥å??ä¿¡æ?¯(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "è?ªå®?ä¹?ä½?ç½®"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "æ¯?å¤©"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (ä½¿ç?¨ç?»å½?)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#, fuzzy
+msgid "Manual (via Actions menu)"
 msgstr ""
 "æ¯?å¤©\n"
 "æ¯?å?¨\n"
 "æ??å?¨(é??è¿?å?¨ä½?è??å??)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "å?¯ç?¨(_N)"
-
-#: ../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 ""
-"å®?å?¨ FTP (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:22
+#: ../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.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 "çª?å?£å?±äº«"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "æ??ä»¶(_F)ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "å¯?ç ?(_P)ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "å??å¸?ä¸º(_P)ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "è®°ä½?å¯?ç ?(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"iCal\n"
-"å¿?/é?²"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "ä¸?è?½å??å¸?æ?¥å??ï¼?æ?¥å??å??ç«¯å·²ç»?ä¸?å?å?¨äº?"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:474
 msgid "New Location"
 msgstr "æ?°å»ºä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "Edit Location"
 msgstr "ç¼?è¾?ä½?ç½®"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-#, fuzzy
-msgid "Hello Python"
-msgstr "å®¶åºç?µè¯?"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr ""
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr ""
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr ""
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr ""
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "Python è£?å?¥å?¨"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "å??å?¾å??æ??(å??ç½®)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, fuzzy, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "å??å?¾å??æ??æ??ä»¶"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, fuzzy, c-format
 msgid "Failed to create pipe: %s"
 msgstr "å??å»ºæ?¬å?°é?®ä»¶å?å?¨â??%sâ??å¤±è´¥ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, fuzzy, c-format
 msgid "Error after fork: %s"
 msgstr ""
 "%s é??è¯¯ï¼?\n"
 " %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr ""
+msgstr "SpamAssassin å?è¿?ç¨?æ²¡æ??å??åº?ï¼?å?³é?ä¸..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr ""
+msgstr "ç?å¾?å??æ¢ SpamAssassin å?è¿?ç¨?ï¼?ç»?æ¢ä¸..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr ""
+msgstr "SpamAssassin ç??ç®¡é??å?ºé??äº?ï¼?é??è¯¯ç ?ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
-#, c-format
-msgid "SpamAssassin is not available."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#, fuzzy, c-format
+msgid "SpamAssassin is not available. Please install it first."
 msgstr "å??å?¾å??æ??ä¸?å?¯ç?¨ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "è¿?å°?è®©å??å?¾å??æ??æ?´å?¯é? ï¼?ä½?ç¨?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "I_nclude remote tests"
 msgstr "å??å?«è¿?ç¨?æµ?è¯?(_N)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr "ä½¿ç?¨å??å?¾å??æ??è¿?æ»¤å??å?¾é?®ä»¶ã??æ¤æ??ä»¶é??è¦?å®?è£? Spamassassinã??"
+#, fuzzy
+msgid "Filter junk messages using SpamAssassin."
+msgstr "ä½¿ç?¨ Bogofilter è¿?æ»¤å??å?¾ä¿¡ä»¶ã??"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "å??å?¾å??æ??é??é¡¹"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin å??å?¾è¿?æ»¤å?¨"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "å??å?¾å??æ??æ??ä»¶"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "ä¸?æ¬¡ä¿?å?å?¨é?¨é??ä»¶æ??ä¿¡ä»¶ç??ä¸?å??é?¨å??ç??æ??ä»¶ã??"
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "ä¿?å?é??ä»¶"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "ä¿?å?é??ä»¶..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "ä¿?å?å?¨é?¨é??ä»¶"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "é??æ?©ä¿?å?å?ºç¡?å??ç§°"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME ç±»å??"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "ä¿?å?"
+msgid "SpamAssassin Options"
+msgstr "å??å?¾å??æ??é??é¡¹"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:157
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:353
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:355
 msgid "Description List"
 msgstr "æ??è¿°å??è¡¨"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "Categories List"
 msgstr "ç±»å?«å??è¡¨"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Comment List"
 msgstr "æ³¨é??å??è¡¨"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "å??å»ºæ?¶é?´"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Contact List"
 msgstr "è??ç³»äººå??è¡¨"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "Start"
 msgstr "å¼?å§?"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "End"
 msgstr "ç»?æ??"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "percent Done"
 msgstr "å®?æ??ç?¾å??æ¯?"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Attendees List"
 msgstr "å?ºå¸è??å??è¡¨"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Modified"
 msgstr "ä¿®æ?¹æ?¥æ??"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "CSV æ ¼å¼?ç??é«?çº§é??é¡¹"
+#: ../plugins/save-calendar/csv-format.c:520
+msgid "A_dvanced options for the CSV format"
+msgstr "CSV æ ¼å¼?ç??é«?çº§é??é¡¹(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "å??ç½®å¤´"
+#: ../plugins/save-calendar/csv-format.c:527
+msgid "Prepend a _header"
+msgstr "é¢?ç½®æ ?å¤´(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "å?¼å??é??ç¬¦ï¼?"
+#: ../plugins/save-calendar/csv-format.c:536
+msgid "_Value delimiter:"
+msgstr "æ?°å?¼å??é??ç¬¦(_V)ï¼?"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "è®°å½?å??é??ç¬¦ï¼?"
+#: ../plugins/save-calendar/csv-format.c:543
+msgid "_Record delimiter:"
+msgstr "è®°å½?å??é??ç¬¦(_R)ï¼?"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "å°?å?¼ä»¥ä¸?å??å½¢å¼?å°?è£?ï¼?"
+#: ../plugins/save-calendar/csv-format.c:550
+msgid "_Encapsulate values with:"
+msgstr "å°?è£?æ?°å?¼ä½¿ç?¨(_E)ï¼?"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../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 "ä¿?å?é??ä¸"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "æ??é??ä¸ç??æ?¥å??æ??ä»»å?¡å??è¡¨ä¿?å?å?°ç£?ç??ã??"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "ä¿?å?å?°ç£?ç??(_S)"
+msgid "Save a calendar or task list to disk."
+msgstr "ä¿?å?ä¸?ä¸ªæ?¥å??æ??è??ä»»å?¡å?°ç£?ç??ã??"
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "RDF æ ¼å¼?(.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:111
+msgid "_Format:"
+msgstr "æ ¼å¼?(_F)ï¼?"
+
+#: ../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 "Select one source"
-msgstr "é??æ?©ä¸?ä¸ªæ?¥æº?"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-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:323
+#, fuzzy
+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:358
+#, fuzzy
+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:393
+#, fuzzy
+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."
@@ -19568,15 +18590,15 @@ msgstr "æ??å¼?æ?¨è¿?è¡?å??å§?å¸?æ?·ç??è®¾ç½®ã??"
 msgid "Setup Assistant"
 msgstr "è®¾ç½®å?©æ??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Evolution Setup Assistant"
 msgstr "Evolution è®¾ç½®å?©æ??"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:92
 msgid "Welcome"
 msgstr "æ¬¢è¿?"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../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"
@@ -19589,34 +18611,31 @@ msgstr ""
 "è¯·å??å?»â??å??è¿?â??æ??é?®ç»§ç»ã??"
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-msgid "Importing files"
-msgstr "å¯¼å?¥æ??ä»¶"
-
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../widgets/misc/e-import-assistant.c:386
 msgid "Please select the information that you would like to import:"
 msgstr "è¯·é??æ?©æ?¨å¸?æ??å¯¼å?¥ç??ä¿¡æ?¯ï¼?"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../widgets/misc/e-import-assistant.c:543
 #, c-format
 msgid "From %s:"
 msgstr "ä»? %sï¼?"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
-#, 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:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:232
 msgid "Please wait"
 msgstr "è¯·ç¨?å??"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "è¡¨æ??ä¿¡ä»¶çº¿ç´¢æ?¯å?¦åº?ä»¥ä¸»é¢?ä¸ºå??ã??"
+msgid "Sort mail message threads by subject."
+msgstr "é??è¿?ä¸»é¢?æ?¥æ??åº?é?®ä»¶ä¿¡æ?¯ã??"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -19638,71 +18657,85 @@ msgid ""
 "message body."
 msgstr "æ¶?æ?¯ä¸»ä½?ä¸ç??ç?¨äº?é??ä»¶æ??é??æ??ä»¶ç??çº¿ç´¢å??è¡¨ã??"
 
-#: ../plugins/templates/templates.c:603
-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:711
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "å?¦å?ä¸ºæ¨¡æ?¿(_T)"
 
-#: ../plugins/templates/templates.c:713
+#: ../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 "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "ä¸?ä¸ªä½¿ç?¨ yTNEF æ?¥è§£ç ? TNEF é??ä»¶ç??ç®?å??æ??ä»¶ã??"
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "ä»? Microsoft Outlook ä¸è§£ç ? TNEF (winmail.dat) é??ä»¶ã??"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "TNEF é??ä»¶è§£ç ?å?¨"
+msgid "TNEF Decoder"
+msgstr "TNEF è§£ç ?å?¨"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline vCards"
+msgstr "å¤?ä¸ª vCard"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "å?¨é?®ä»¶ä¿¡æ?¯é??ç?´æ?¥æ?¥ç?? vCardsã??"
+
+#: ../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:163
+msgid "Show Compact vCard"
+msgstr "æ?¾ç¤ºç´§å?? vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:224
+msgid "There is one other contact."
+msgstr "æ??å?¦å¤? 1 ä¸ªè??ç³»äººã??"
+
+#: ../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 ä¸ªè??ç³»äººã??"
+
+#: ../plugins/vcard-inline/vcard-inline.c:254
+msgid "Save in Address Book"
+msgstr "ä¿?å?è?³å?°å??ç°¿"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "è®¾ç½® WebDAV è??ç³»äººç??æ??ä»¶ã??"
+msgid "Add WebDAV contacts to Evolution."
+msgstr "æ·»å?  WebDAV è??ç³»äººå?° Evolutionã??"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV è??ç³»äºº"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URLï¼?"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr ""
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution å¤?å£³"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Evolution å¤?å£³é??ç½®å·¥å??"
-
-#: ../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 æµ?è¯?ç»?ä»¶"
+msgstr "é?¿å?? IfMatch (é??è¦? Apache < 2.2.8)"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
-msgstr ""
+msgstr "è®¤è¯?ä»£ç??æ??å?¡å?¨è¿?æ?¥"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
@@ -19717,44 +18750,53 @@ msgid "Default sidebar width"
 msgstr "é»?è®¤ä¾§è¾¹æ ?å®½åº¦"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+msgid "Default window X coordinate"
+msgstr "é»?è®¤çª?å?£ç?¶æ??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+msgid "Default window Y coordinate"
+msgstr "é»?è®¤çª?å?£ç?¶æ??"
+
+#: ../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
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
+msgstr "å?¨äº?è??ç½?ä¸?è¿?æ?¥å?° HTTP/HTTPS æ?¶ï¼?å?¯ç?¨ä»£ç??è®¾ç½®ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy host name"
-msgstr ""
+msgstr "HTTP ä»£ç??ä¸»æ?ºå??ç§°"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy password"
-msgstr "è¾?å?¥å¯?ç ?"
+msgstr "HTTP ä»£ç??å¯?ç ?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy port"
-msgstr ""
+msgstr "HTTP ä»£ç??ç«¯å?£"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy username"
-msgstr ""
+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
+#: ../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/"
@@ -19762,45 +18804,62 @@ msgid ""
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../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:18
+msgid "Initial file chooser folder"
+msgstr "å??å§?æ??ä»¶é??æ?©å?¨æ??ä»¶å¤¹"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser å¯¹è¯?æ¡?ç??èµ·å§?æ??ä»¶å¤¹ã??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "ä¸?æ¬¡å??çº§ç??é??ç½®ç??æ?¬"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../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:17
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
-msgstr ""
+msgstr "é??ä»£ç??ä¸»æ?º"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "ç?¨äº? HTTP ä»£ç??è®¤è¯?ç??å¯?ç ?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
-msgstr "é??ç½®"
+msgstr "ä»£ç??é??ç½®æ¨¡å¼?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
-msgstr ""
+msgstr "SOCKS ä»£ç??ä¸»æ?ºå??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
-msgstr ""
+msgstr "SOCKS ä»£ç??ç«¯å?£"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
-msgstr ""
+msgstr "å®?å?¨ HTTP ä»£ç??ä¸»æ?ºå??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
-msgstr ""
+msgstr "å®?å?¨ HTTP ä»£ç??ç«¯å?£"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../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 "
@@ -19808,86 +18867,96 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "ä¾§è¾¹æ ?å?¯è§?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "è·³è¿?å¼?å??è¦å??å¯¹è¯?æ¡?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:317
 msgid "Start in offline mode"
 msgstr "ä»¥è?±æ?ºæ¨¡å¼?å?¯å?¨"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "ç?¶æ??æ ?å?¯è§?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../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 ç??é??ç½®ç??æ?¬ï¼?å¸¦ä¸»/æ¬¡/é??ç½®çº§å?«(å¦?â??2.6.0â??)ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+#, fuzzy
+msgid "The default X coordinate for the main window."
+msgstr "ä¸»çª?å?£ç??é»?è®¤å®½åº¦ï¼?ä»¥å??ç´ è®¡ã??"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+#, fuzzy
+msgid "The default Y coordinate for the main window."
+msgstr "ä¸»çª?å?£ç??é»?è®¤å®½åº¦ï¼?ä»¥å??ç´ è®¡ã??"
+
+#: ../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:31
+#: ../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:32
+#: ../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:33
+#: ../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 é??ç½®ç??æ?¬ï¼?å¸¦ä¸»/æ¬¡/é??ç½®çº§å?«(å¦?â??2.6.0â??)ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
-msgstr ""
+msgstr "ä»£ç?? HTTP ç??æ?ºå?¨å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
-msgstr ""
+msgstr "ä»£ç??å®?å?¨ HTTP ç??æ?ºå?¨å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
-msgstr ""
+msgstr "ä»£ç??å¥?æ?¥å?ç??æ?ºå?¨å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../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 ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../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 ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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 ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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â??(æ??å?)ã??â??iconâ??(å?¾æ ?)ã??â??bothâ??(äº?è??)ã??"
-"â??toolbarâ??(å·¥å?·æ ?)ã??å¦?æ??è®¾ç½®ä¸ºâ??toolbarâ??(å·¥å?·æ ?)ï¼?å??å·¥å?·æ ?ç??æ ·å¼?ç?± GNOME è®¾ç½®å?³å®?ã??"
+"çª?å?£æ??é?®ç??æ ·å¼?ã??å?¯ä»¥æ?¯â??textâ??(æ??å?)ã??â??iconâ??(å?¾æ ?)ã??â??bothâ??(äº?è??)ã??â??toolbarâ??(å·¥"
+"å?·æ ?)ã??å¦?æ??è®¾ç½®ä¸ºâ??toolbarâ??(å·¥å?·æ ?)ï¼?å??å·¥å?·æ ?ç??æ ·å¼?ç?± GNOME è®¾ç½®å?³å®?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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 "
@@ -19895,274 +18964,569 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "å·¥å?·æ ?å?¯è§?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "ä¸?æ¬¡å??çº§ç??é??ç½®ç??æ?¬"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
-msgstr ""
+msgstr "ä½¿ç?¨ HTTP ä»£ç??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "ç?¨äº? HTTP ä»£ç??è®¤è¯?ç??ç?¨æ?·å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../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:47
+#: ../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:48
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "ä¾§è¾¹æ ?æ?¯å?¦å?¯è§?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "ç?¶æ??æ ?æ?¯å?¦å?¯è§?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "å·¥å?·æ ?æ?¯å?¦å?¯è§?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "æ?¯å?¦è·³è¿? Evoltuion å¼?å??ç??æ?¬ç??è¦å??ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "çª?å?£æ??é?®æ?¯å?¦å?¯è§?ã??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "çª?å?£æ??é?®æ ·å¼?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../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>"
+#. 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-content.c:931
+msgid "Sho_w:"
+msgstr "æ?¾ç¤º(_W)ï¼?"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "å½?å??è¿?æ?¥"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:956
+msgid "Sear_ch:"
+msgstr "æ??ç´¢(_C)ï¼?"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "å??å?»ç¡®å®?å?³é?è¿?äº?è¿?æ?¥ï¼?å¹¶è½¬å?¥è?±æ?ºæ??ä½?"
+#. Scope Combo Widgets
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:998
+msgid "i_n"
+msgstr "å?¨(_N) "
 
-#: ../shell/e-shell-importer.c:131
-msgid "Choose the type of importer to run:"
-msgstr "é??æ?©è¦?è¿?è¡?ç??å¯¼å?¥å?¨ç±»å??ï¼?"
+#: ../shell/e-shell-content.c:1495
+msgid "Advanced Search"
+msgstr "é«?çº§æ??ç´¢"
 
-#: ../shell/e-shell-importer.c:134
-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-content.c:1557 ../shell/e-shell-content.c:1558
+msgid "Searches"
+msgstr "æ??ç´¢"
 
-#: ../shell/e-shell-importer.c:138
-msgid "Choose the destination for this import"
-msgstr "é??æ?©æ¤å¯¼å?¥ç??ç?®ç??ä½?ç½®"
+#: ../shell/e-shell-content.c:1604
+msgid "Save Search"
+msgstr "ä¿?å?æ??ç´¢"
 
-#: ../shell/e-shell-importer.c:144
-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-migrate.c:242 ../shell/e-shell-migrate.c:243
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: ../shell/e-shell-switcher.c:446
+msgid "Toolbar Style"
+msgstr "å·¥å?·æ ?æ ·å¼?"
+
+#: ../shell/e-shell-switcher.c:447
+msgid "The switcher's toolbar style"
 msgstr ""
-"Evolution æ£?æ?¥äº?ä»?ä»¥ä¸?ç¨?åº?å¯¼å?¥ç??è®¾ç½®ï¼?Pineã??Netscapeã??Elmã??\n"
-"iCalendarã??å¹¶æ?ªå??ç?°å?¯å¯¼å?¥ç??è®¾ç½®ã??å¦?æ??æ?¨æ?³è¦?å??è¯?ä¸?æ¬¡ï¼?è¯·å??å?»\n"
-"â??ä¸?ä¸?æ¥â??æ??é?®ã??\n"
 
-#: ../shell/e-shell-importer.c:282
-msgid "F_ilename:"
-msgstr "æ??ä»¶å??(_I)ï¼?"
+#: ../shell/e-shell-switcher.c:463
+msgid "Toolbar Visible"
+msgstr "å·¥å?·æ ?å?¯è§?"
 
-#: ../shell/e-shell-importer.c:287
-msgid "Select a file"
-msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
+#: ../shell/e-shell-switcher.c:464
+msgid "Whether the switcher is visible"
+msgstr "å??æ?¢å?¨æ?¯å?¦å?¯è§?"
 
-#: ../shell/e-shell-importer.c:296
-msgid "File _type:"
-msgstr "æ??ä»¶ç±»å??(_T)ï¼?"
+#: ../shell/e-shell-view.c:486
+#, fuzzy
+msgid "Switcher Action"
+msgstr "å??æ?¢å?° %s"
 
-#: ../shell/e-shell-importer.c:332
-msgid "Import data and settings from _older programs"
-msgstr "ä»?æ?§ç??ç¨?åº?ä¸å¯¼å?¥æ?°æ?®å??è®¾ç½®(_O)"
+#: ../shell/e-shell-view.c:487
+msgid "The switcher action for this shell view"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:335
-msgid "Import a _single file"
-msgstr "å¯¼å?¥å??ä¸ªæ??ä»¶(_S)"
+#: ../shell/e-shell-view.c:502
+msgid "Page Number"
+msgstr "é¡µç ?"
 
-#: ../shell/e-shell-settings-dialog.c:313
-msgid "Evolution Preferences"
-msgstr "Evolution é¦?é??é¡¹"
+#: ../shell/e-shell-view.c:503
+msgid "The notebook page number of the shell view"
+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:328
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+#: ../shell/e-shell-view.c:521
+msgid "The title of the shell view"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:75
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME Pilot å·¥å?·å¥½å??å¹¶æ?ªå®?è£?å?°ç³»ç»?ä¸ã??"
+#: ../shell/e-shell-view.c:536
+msgid "The EShellBackend for this shell view"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:83
-#, c-format
-msgid "Error executing %s."
-msgstr "æ?§è¡? %s é??è¯¯ã??"
+#: ../shell/e-shell-view.c:551
+msgid "Shell Content Widget"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:139
-msgid "Bug buddy is not installed."
-msgstr "æ?ªå®?è£? Bug buddyã??"
+#: ../shell/e-shell-view.c:552
+msgid "The content widget appears in a shell window's right pane"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:142
-msgid "Bug buddy could not be run."
-msgstr "æ? æ³?è¿?è¡? Bug buddyã??"
+#: ../shell/e-shell-view.c:568
+#, fuzzy
+msgid "Shell Sidebar Widget"
+msgstr "é»?è®¤ä¾§è¾¹æ ?å®½åº¦"
+
+#: ../shell/e-shell-view.c:569
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr ""
+
+#: ../shell/e-shell-view.c:584
+#, fuzzy
+msgid "Shell Taskbar Widget"
+msgstr "é??æ?©ä»»å?¡å??è¡¨"
+
+#: ../shell/e-shell-view.c:585
+msgid "The taskbar widget appears at the bottom of a shell window"
+msgstr ""
+
+#: ../shell/e-shell-view.c:600
+#, fuzzy
+msgid "Shell Window"
+msgstr "æ?°å»ºçª?å?£(_W)"
+
+#: ../shell/e-shell-view.c:601
+msgid "The window to which the shell view belongs"
+msgstr ""
+
+#: ../shell/e-shell-view.c:616
+#, fuzzy
+msgid "Current View ID"
+msgstr "å½?å??è§?å?¾(_C)"
+
+#: ../shell/e-shell-view.c:617
+#, fuzzy
+msgid "The current GAL view ID"
+msgstr "å½?å??æ?¶é?´"
 
 #. 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:942
+#: ../shell/e-shell-window-actions.c:643
 msgid "translator-credits"
 msgstr ""
 "å¼?æº?è½¯ä»¶å?½é??å??ä¹?ç®?ä½?ä¸æ??ç»?\n"
 "http://i18n.linux.net.cn";
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-actions.c:654
 msgid "Evolution Website"
 msgstr "Evolution ç½?ç«?"
 
-#: ../shell/e-shell-window-commands.c:1170
-msgid "_Work Online"
-msgstr "è??æ?ºå·¥ä½?(_W)"
+#: ../shell/e-shell-window-actions.c:1295
+#, fuzzy
+msgid "Bug Buddy is not installed."
+msgstr "æ?ªå®?è£? Bug buddyã??"
+
+#: ../shell/e-shell-window-actions.c:1297
+#, fuzzy
+msgid "Bug Buddy could not be run."
+msgstr "æ? æ³?è¿?è¡? Bug buddyã??"
+
+#: ../shell/e-shell-window-actions.c:1399
+msgid "GNOME Pilot is not installed."
+msgstr "GNOME Pilot æ²¡æ??å®?è£?ã??"
+
+#: ../shell/e-shell-window-actions.c:1401
+msgid "GNOME Pilot could not be run."
+msgstr "GNOME Pilot ä¸?è?½è¿?è¡?ã??"
+
+#: ../shell/e-shell-window-actions.c:1495
+msgid "Show information about Evolution"
+msgstr "æ?¾ç¤ºå?³äº? Evolution ç??ä¿¡æ?¯"
+
+#: ../shell/e-shell-window-actions.c:1500
+msgid "_Close Window"
+msgstr "å?³é?çª?å?£(_C)"
+
+#: ../shell/e-shell-window-actions.c:1507
+#, fuzzy
+msgid "_Contents"
+msgstr "è??ç³»äºº"
+
+#: ../shell/e-shell-window-actions.c:1509
+msgid "Open the Evolution User Guide"
+msgstr "æ??å¼? Evolution ç?¨æ?·æ??å??"
+
+#: ../shell/e-shell-window-actions.c:1514
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
+
+#: ../shell/e-shell-window-actions.c:1516
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "æ??å¼? FAQ ç½?é¡µ"
+
+#: ../shell/e-shell-window-actions.c:1521
+msgid "_Forget Passwords"
+msgstr "ä¸¢å¼?å¯?ç ?(_F)"
+
+#: ../shell/e-shell-window-actions.c:1523
+msgid "Forget all remembered passwords"
+msgstr "å¿?è®°æ??æ??è®°ä½?ç??å¯?ç ?"
+
+#: ../shell/e-shell-window-actions.c:1528
+msgid "I_mport..."
+msgstr "å¯¼å?¥(_M)..."
+
+#: ../shell/e-shell-window-actions.c:1530
+msgid "Import data from other programs"
+msgstr "ä»?å?¶å®?ç¨?åº?å¯¼å?¥æ?°æ?®"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-actions.c:1535
+msgid "New _Window"
+msgstr "æ?°å»ºçª?å?£(_W)"
+
+#: ../shell/e-shell-window-actions.c:1537
+msgid "Create a new window displaying this view"
+msgstr "å??å»ºä¸?ä¸ªæ?°çª?å?£æ?¥æ?¾ç¤ºè¿?ä¸ªè§?å?¾"
+
+#: ../shell/e-shell-window-actions.c:1544
+msgid "Configure Evolution"
+msgstr "é??ç½® Evolution"
+
+#: ../shell/e-shell-window-actions.c:1549
+msgid "_Quick Reference"
+msgstr "å¿«é??é¦?é??é¡¹(_Q)"
+
+#: ../shell/e-shell-window-actions.c:1551
+#, fuzzy
+msgid "Show Evolution's shortcut keys"
+msgstr "æ?´æ?¹ Evolution ç??è®¾ç½®"
+
+#: ../shell/e-shell-window-actions.c:1558
+msgid "Exit the program"
+msgstr "é??å?ºç¨?åº?"
+
+#: ../shell/e-shell-window-actions.c:1563
+msgid "_Advanced Search..."
+msgstr "é«?çº§æ??ç´¢(_A)..."
+
+#: ../shell/e-shell-window-actions.c:1565
+msgid "Construct a more advanced search"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1572
+#, fuzzy
+msgid "Clear the current search parameters"
+msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
+
+#: ../shell/e-shell-window-actions.c:1577
+msgid "_Edit Saved Searches..."
+msgstr "ç¼?è¾?ä¿?å?ç??æ??ç´¢(_E)..."
+
+#: ../shell/e-shell-window-actions.c:1579
+msgid "Manage your saved searches"
+msgstr "ç®¡ç??æ?¨ä¿?å?ç??æ??ç´¢"
+
+#: ../shell/e-shell-window-actions.c:1586
+msgid "Click here to change the search type"
+msgstr "å??å?»æ¤å¤?æ?´æ?¹æ??ç´¢ç±»å??"
+
+#: ../shell/e-shell-window-actions.c:1591
+msgid "_Find Now"
+msgstr "ç«?å?³æ?¥æ?¾(_F)"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1593
+#, fuzzy
+msgid "Execute the current search parameters"
+msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
+
+#: ../shell/e-shell-window-actions.c:1598
+msgid "_Save Search..."
+msgstr "ä¿?å?æ??ç´¢(_S)..."
+
+#: ../shell/e-shell-window-actions.c:1600
+#, fuzzy
+msgid "Save the current search parameters"
+msgstr "ä¿?å?å½?å??æ??ä»¶"
+
+#: ../shell/e-shell-window-actions.c:1605
+msgid "Send / _Receive"
+msgstr "å??é??/æ?¥æ?¶(_R)"
+
+#: ../shell/e-shell-window-actions.c:1607
+msgid "Send queued items and retrieve new items"
+msgstr "å??é??é??å??ä¸ç??ç??é?®ä»¶å¹¶æ?¶å??æ?°é?®ä»¶"
+
+#: ../shell/e-shell-window-actions.c:1612
+#, fuzzy
+msgid "Submit _Bug Report..."
+msgstr "æ??äº¤é??è¯¯æ?¥å??(_B)"
+
+#: ../shell/e-shell-window-actions.c:1614
+msgid "Submit a bug report using Bug Buddy"
+msgstr "ç?¨ Bug Buddy æ??äº¤é??è¯¯æ?¥å??"
+
+#: ../shell/e-shell-window-actions.c:1619
+msgid "_Synchronization Options..."
+msgstr "å??æ¥é??é¡¹(_S)..."
+
+#: ../shell/e-shell-window-actions.c:1621
+msgid "Set up Pilot configuration"
+msgstr "é??ç½® Pilot"
+
+#: ../shell/e-shell-window-actions.c:1626
 msgid "_Work Offline"
 msgstr "è?±æ?ºå·¥ä½?(_W)"
 
-#: ../shell/e-shell-window-commands.c:1196
-msgid "Work Offline"
-msgstr "è?±æ?ºå·¥ä½?"
+#: ../shell/e-shell-window-actions.c:1628
+#, fuzzy
+msgid "Put Evolution into offline mode"
+msgstr "ä»¥è?±æ?ºæ¨¡å¼?å?¯å?¨"
 
-#: ../shell/e-shell-window.c:377
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr "Evolution ç?®å??è??æ?ºã??\nå??å?»è¯¥æ??é?®å?¯è?±æ?ºå·¥ä½?ã??"
+#: ../shell/e-shell-window-actions.c:1633
+msgid "_Work Online"
+msgstr "è??æ?ºå·¥ä½?(_W)"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution æ£å?¨è?±æ?ºè¿?ç¨?ä¸ã??"
+#: ../shell/e-shell-window-actions.c:1635
+#, fuzzy
+msgid "Put Evolution into online mode"
+msgstr "ä»¥è??æ?ºæ¨¡å¼?å?¯å?¨"
 
-#: ../shell/e-shell-window.c:391
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
-msgstr "Evolution ç?®å??è?±æ?ºã??\nå??å?»è¯¥æ??é?®å?¯è??æ?ºå·¥ä½?ã??"
+#: ../shell/e-shell-window-actions.c:1663
+msgid "Lay_out"
+msgstr "å¸?å±?(_O)"
 
-#: ../shell/e-shell-window.c:787
-#, c-format
-msgid "Switch to %s"
-msgstr "å??æ?¢å?° %s"
+#: ../shell/e-shell-window-actions.c:1670
+msgid "_New"
+msgstr "æ?°å»º(_N)"
 
-#: ../shell/e-shell.c:640
-msgid "Unknown system error."
-msgstr "æ?ªç?¥ç??ç³»ç»?é??è¯¯ã??"
+#: ../shell/e-shell-window-actions.c:1677
+msgid "_Search"
+msgstr "æ??ç´¢(_S)"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: ../shell/e-shell-window-actions.c:1684
+msgid "_Switcher Appearance"
+msgstr "å??æ?¢å?¨å¤?è§?(_S)"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
-msgid "OK"
-msgstr "ç¡®å®?"
+#: ../shell/e-shell-window-actions.c:1698
+msgid "_Window"
+msgstr "çª?å?£(_W)"
+
+#: ../shell/e-shell-window-actions.c:1708
+msgid "Show Side _Bar"
+msgstr "æ?¾ç¤ºä¾§è¾¹æ ?(_B)"
+
+#: ../shell/e-shell-window-actions.c:1710
+msgid "Show the side bar"
+msgstr "æ?¾ç¤ºä¾§è¾¹æ ?"
+
+#: ../shell/e-shell-window-actions.c:1716
+msgid "Show _Status Bar"
+msgstr "æ?¾ç¤ºç?¶æ??æ ?(_S)"
+
+#: ../shell/e-shell-window-actions.c:1718
+msgid "Show the status bar"
+msgstr "æ?¾ç¤ºç?¶æ??æ ?"
 
-#: ../shell/e-shell.c:1263
-msgid "Invalid arguments"
-msgstr "æ? æ??å??æ?°"
+#: ../shell/e-shell-window-actions.c:1724
+msgid "Show _Buttons"
+msgstr "æ?¾ç¤ºæ??é?®(_B)"
 
-#: ../shell/e-shell.c:1265
-msgid "Cannot register on OAF"
-msgstr "æ? æ³?æ³¨å??å?° OAF"
+#: ../shell/e-shell-window-actions.c:1726
+msgid "Show the switcher buttons"
+msgstr "æ?¾ç¤ºå??æ?¢å?¨æ??é?®"
 
-#: ../shell/e-shell.c:1267
-msgid "Configuration Database not found"
-msgstr "æ?¾ä¸?å?°é??ç½®æ?°æ?®åº?"
+#: ../shell/e-shell-window-actions.c:1732
+msgid "Show _Tool Bar"
+msgstr "æ?¾ç¤ºå·¥å?·æ ?(_T)"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-shell-window-actions.c:1734
+msgid "Show the toolbar"
+msgstr "æ?¾ç¤ºå·¥å?·æ ?"
+
+#: ../shell/e-shell-window-actions.c:1756
+msgid "_Icons Only"
+msgstr "å?ªæ??å?¾æ ?(_I)"
+
+#: ../shell/e-shell-window-actions.c:1758
+msgid "Display window buttons with icons only"
+msgstr "æ?¾ç¤ºå?ªæ??å?¾æ ?ç??çª?å?£æ??é?®"
+
+#: ../shell/e-shell-window-actions.c:1763
+msgid "_Text Only"
+msgstr "å?ªæ??æ??å?(_T)"
+
+#: ../shell/e-shell-window-actions.c:1765
+msgid "Display window buttons with text only"
+msgstr "æ?¾ç¤ºå?ªæ??æ??å?ç??çª?å?£æ??é?®"
+
+#: ../shell/e-shell-window-actions.c:1770
+msgid "Icons _and Text"
+msgstr "å?¾æ ?å??æ??å?(_A)"
+
+#: ../shell/e-shell-window-actions.c:1772
+msgid "Display window buttons with icons and text"
+msgstr "æ?¾ç¤ºå¸¦å?¾æ ?å??æ??å?ç??çª?å?£æ??é?®"
+
+#: ../shell/e-shell-window-actions.c:1777
+msgid "Tool_bar Style"
+msgstr "å·¥å?·æ ?æ ·å¼?(_B)"
+
+#: ../shell/e-shell-window-actions.c:1779
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "ä½¿ç?¨æ¡?é?¢å·¥å?·æ ?è®¾ç½®æ?¾ç¤ºçª?å?£æ??é?®"
+
+#: ../shell/e-shell-window-actions.c:1787
+msgid "Define Views..."
+msgstr "å®?ä¹?è§?å?¾..."
+
+#: ../shell/e-shell-window-actions.c:1789
+msgid "Create or edit views"
+msgstr "å??å»ºæ??ç¼?è¾?è§?å?¾"
+
+#: ../shell/e-shell-window-actions.c:1794
+msgid "Save Custom View..."
+msgstr "ä¿?å?å½?å??è§?å?¾..."
+
+#: ../shell/e-shell-window-actions.c:1796
+msgid "Save current custom view"
+msgstr "ä¿?å?å½?å??è?ªå®?ä¹?è§?å?¾"
+
+#: ../shell/e-shell-window-actions.c:1803
+msgid "C_urrent View"
+msgstr "å½?å??è§?å?¾(_U)"
+
+#: ../shell/e-shell-window-actions.c:1813
+msgid "Custom View"
+msgstr "å½?å??è§?å?¾"
+
+#: ../shell/e-shell-window-actions.c:1815
+msgid "Current view is a customized view"
+msgstr "å½?å??è§?å?¾ä¸ºè?ªå®?ä¹?è§?å?¾"
+
+#: ../shell/e-shell-window-actions.c:1825
+#, fuzzy
+msgid "Change the page settings for your current printer"
+msgstr "è®¾å®?æ?¨å½?å??æ??å?°æ?ºç??é¡µé?¢è®¾ç½®"
+
+#: ../shell/e-shell-window-actions.c:2097
+#, c-format
+msgid "Switch to %s"
+msgstr "å??æ?¢å?° %s"
+
+#: ../shell/e-shell-window-actions.c:2300
+msgid "Execute these search parameters"
+msgstr ""
+
+#: ../shell/e-shell-window-private.c:254
 msgid "New"
 msgstr "æ?°å»º"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "New Test"
-msgstr "æ?°å»ºæµ?è¯?"
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:588
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/test/evolution-test-component.c:106
-msgctxt "New"
-msgid "_Test"
-msgstr "æµ?è¯?(_T)"
+#: ../shell/e-shell-window.c:308
+msgid "Active Shell View"
+msgstr ""
 
-#: ../shell/test/evolution-test-component.c:107
-msgid "Create a new test item"
-msgstr "å??å»ºæ?°æµ?è¯?é¡¹"
+#: ../shell/e-shell-window.c:309
+#, fuzzy
+msgid "Name of the active shell view"
+msgstr "æ?°è§?å?¾ç??å??ç§°ï¼?"
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "å??å?»â??å¯¼å?¥â??ä»¥ä¾¿å¼?å§?å°?æ??ä»¶å¯¼å?¥å?° Evolutionã??"
+#: ../shell/e-shell-window.c:323 ../shell/e-shell.c:743
+msgid "Geometry"
+msgstr ""
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Evolution å¯¼å?¥å?©æ??"
+#: ../shell/e-shell-window.c:324 ../shell/e-shell.c:744
+msgid "Initial window geometry string"
+msgstr ""
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "å¯¼å?¥æ??ä»¶"
+#: ../shell/e-shell-window.c:339
+msgid "Safe Mode"
+msgstr "å®?å?¨æ¨¡å¼?"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "å¯¼å?¥ä½?ç½®"
+#: ../shell/e-shell-window.c:340
+#, fuzzy
+msgid "Whether the shell window is in safe mode"
+msgstr "æ??ä»¶æ?¯å?¦å·²å?¯ç?¨"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "å¯¼å?¥å?¨ç±»å??"
+#: ../shell/e-shell-window.c:371
+msgid "UI Manager"
+msgstr "UI ç®¡ç??å?¨"
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "é??æ?©è¦?å¯¼å?¥ç??ä¿¡æ?¯"
+#: ../shell/e-shell-window.c:372
+msgid "The shell window's GtkUIManager"
+msgstr ""
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
+#: ../shell/e-shell.c:211
+msgid "Preparing to go offline..."
+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."
+#: ../shell/e-shell.c:265
+msgid "Preparing to go online..."
+msgstr "æ£å?¨å??å¤?ä¸?çº¿..."
+
+#: ../shell/e-shell.c:337
+msgid "Preparing to quit..."
 msgstr ""
-"æ¬¢è¿?ä½¿ç?¨ Evolution å¯¼å?¥å?©æ??ã??\n"
-"æ?¬å?©æ??å°?å?¨ç¨?æ??å¯¼æ?¨å°?å¤?é?¨æ??ä»¶å¯¼å?¥ Evolutionã??"
+
+#: ../shell/e-shell.c:759
+msgid "Network Available"
+msgstr "ç½?ç»?å?¯ç?¨"
+
+#: ../shell/e-shell.c:760
+msgid "Whether the network is available"
+msgstr "ç½?ç»?æ?¯å?¦å?¯ç?¨"
+
+#: ../shell/e-shell.c:775 ../widgets/misc/e-online-button.c:130
+msgid "Online"
+msgstr "å?¨çº¿"
+
+#: ../shell/e-shell.c:776
+#, fuzzy
+msgid "Whether the shell is online"
+msgstr "æ??ä»¶æ?¯å?¦å·²å?¯ç?¨"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:162
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20194,7 +19558,7 @@ msgstr ""
 "\n"
 "æ??ä»¬å¸?æ??æ?¨å°½æ??äº«å??æ??ä»¬å?ªå??å·¥ä½?ç??æ??æ??ï¼?æ??ä»¬ä¹?ç?å??ç?¼æ??ç??æ?¨ç??æ??è§?ï¼?\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:186
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20202,43 +19566,57 @@ msgstr ""
 "æ??è°¢\n"
 "Evolution å?¢é??\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:193
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é??ç?¥æ??"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:313
 msgid "Start Evolution activating the specified component"
 msgstr "å?¯å?¨ Evolution å¹¶æ¿?æ´»æ??å®?ç»?ä»¶"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:315
+msgid "Apply the given geometry to the main window"
+msgstr ""
+
+#: ../shell/main.c:319
 msgid "Start in online mode"
 msgstr "ä»¥è??æ?ºæ¨¡å¼?å?¯å?¨"
 
-#: ../shell/main.c:488
-msgid "Forcibly shut down all Evolution components"
+#: ../shell/main.c:322
+#, fuzzy
+msgid "Forcibly shut down Evolution"
 msgstr "å¼ºå?¶å?³é?æ??æ?? Evolution ç»?ä»¶"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:326
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "å¼ºå?¶ä»? Evolution 1.4 é??æ?°å??è¿?"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:329
 msgid "Send the debugging output of all components to a file."
 msgstr "æ??æ??æ??æ??å??ç??è°?è¯?è¾?å?ºå??é??å?°ä¸?ä¸ªæ??ä»¶ä¸ã??"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:331
 msgid "Disable loading of any plugins."
 msgstr "ç¦?æ¢è£?å?¥ä»»ä½?æ??ä»¶ã??"
 
-#: ../shell/main.c:499
+#: ../shell/main.c:333
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ç¦?ç?¨é?®ä»¶ã??è??ç³»äººå??ä»»å?¡ç??é¢?è§?é?¢æ?¿ã??"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:337
+msgid "Import URIs or file names given as rest of arguments."
+msgstr ""
+
+#: ../shell/main.c:339
+#, fuzzy
+msgid "Request a running Evolution process to quit"
+msgstr "é??æ?°å?¯å?¨ Evolution"
+
+#: ../shell/main.c:496
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution ä¸ªäººä¿¡æ?¯ç®¡ç??å??é?®ä»¶å®¢æ?·"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:521
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20252,36 +19630,28 @@ 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
+#: ../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"
@@ -20300,16 +19670,8 @@ msgstr ""
 "\n"
 "å? é?¤ä¹?å??ï¼?æ?¨å°?æ? æ³?é??çº§è?³å??å??ç??æ?¬ç?? Evolutionï¼?é?¤é??æ?¨æ??å?¨ä»?å¤´æ?¥è¿?ã??\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:14
 #, fuzzy
-#| 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"
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -20323,11 +19685,11 @@ msgstr ""
 "å¦?æ??æ?¨é??æ?©å? é?¤æ¤æ?°æ?®ï¼?â??evolutionâ??ç?®å½?ä¸ç??å?¨é?¨å??å®¹é?½å°?è¢«æ°¸ä¹?å? é?¤ã??å¦?æ??æ?¨é??æ?©ä¿?"
 "ç??æ¤æ?°æ?®ï¼?é?£ä¹?æ?¨å?¯ä»¥å?¨æ?¨æ?¹ä¾¿ç??æ?¶å??æ??å?¨å? é?¤â??evolutionâ??ç?®å½?ã??\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"
@@ -20339,45 +19701,22 @@ msgstr ""
 "\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
+#, fuzzy
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
@@ -20386,7 +19725,91 @@ msgstr ""
 "\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 ""
+
+#: ../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 ""
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1394
+#, c-format
+msgid "Not a launchable item"
+msgstr "ä¸?æ?¯ä¸?ä¸ªå?¯å? è½½ç??æ?¡ç?®"
+
+#: ../smclient/eggsmclient.c:225
+#, fuzzy
+msgid "Disable connection to session manager"
+msgstr "ç?´æ?¥è¿?æ?¥å?° Internet(_D)"
+
+#: ../smclient/eggsmclient.c:228
+#, fuzzy
+msgid "Specify file containing saved configuration"
+msgstr "é??ç½® Pilot"
+
+#: ../smclient/eggsmclient.c:228
+msgid "FILE"
+msgstr "æ??ä»¶"
+
+#: ../smclient/eggsmclient.c:231
+msgid "Specify session management ID"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:231
+msgid "ID"
+msgstr "ID"
+
+#: ../smclient/eggsmclient.c:252
+msgid "Session management options:"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:253
+#, fuzzy
+msgid "Show session management options"
+msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»(_S)"
+
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20397,69 +19820,73 @@ msgstr ""
 "\n"
 "ç¼?è¾?ä¿¡ä»»è®¾ç½®ï¼?"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../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:155
+#: ../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:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
+#: ../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:146
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "å?¨é?¨ PKCS12 æ??ä»¶"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:394
-#: ../smime/gui/certificate-manager.c:618
+#: ../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:271
-#: ../smime/gui/certificate-manager.c:480
-#: ../smime/gui/certificate-manager.c:702
+#: ../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:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "ç?¨é??"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:35
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "åº?å??å?·"
 
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "å?°æ??"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "æ??æ??ç?µå?é?®ä»¶è¯?ä¹¦æ??ä»¶"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "ç?µå?é?®ä»¶å?°å??"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "å?¨é?¨é¢?è¯?æ?ºæ??æ??ä»¶"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-manager.c:1046
+msgid "Certificates"
+msgstr "è¯?ä¹¦"
+
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "è¯?ä¹¦æ?¥ç??å?¨ï¼?%s"
@@ -20479,7 +19906,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"
@@ -20488,7 +19915,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"
@@ -20497,191 +19924,194 @@ 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
+#: ../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 "å?¨ä¿¡ä»»æ¤ CA ç??ä»»ä½?ç?¨é??ä¹?å??ï¼?æ?¨åº?è¯¥å??æ£?æ?¥è¯¥è¯?ä¹¦å??å?¶ç?ç?¥å??è¿?ç¨?(è?¥å?¯ç?¨)ã??"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1058
 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
+#, fuzzy
+msgid "Certificate Fields"
+msgstr "<b>è¯?ä¹¦å??</b>"
+
+#: ../smime/gui/smime-ui.ui.h:9
+#, fuzzy
+msgid "Certificate Hierarchy"
+msgstr "<b>è¯?ä¹¦å±?æ¬¡</b>"
+
+#: ../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
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Dummy window only"
 msgstr "å?ªå¯¹å??çª?å?£"
 
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Edit"
 msgstr "ç¼?è¾?"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Certificate Trust Settings"
 msgstr "ç?µå?é?®ä»¶è¯?ä¹¦ä¿¡ä»»è®¾ç½®"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Recipient Certificate"
 msgstr "ç?µå?é?®ä»¶æ?¶ä»¶äººè¯?ä¹¦"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Email Signer Certificate"
 msgstr "ç?µå?é?®ä»¶ç¾å??è??è¯?ä¹¦"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "Expires On"
 msgstr "å?°æ??"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:22
+#, fuzzy
+msgid "Field Value"
+msgstr "å??å??"
+
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "Fingerprints"
+msgstr "æ??çº¹"
+
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Import"
 msgstr "å¯¼å?¥"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:26
+msgid "Issued By"
+msgstr "é¢?å??è??"
+
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Issued On"
 msgstr "å??è¡?æ?¥æ??"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:28
+msgid "Issued To"
+msgstr "é¢?å??ç»?"
+
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "MD5 Fingerprint"
 msgstr "MD5 æ??çº¹"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organization (O)"
 msgstr "ç»?ç»?(O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "Organizational Unit (OU)"
 msgstr "ç»?ç»?å??å??(OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:32
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 æ??çº¹"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL å®¢æ?·è¯?ä¹¦"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.ui.h:34 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL æ??å?¡å?¨è¯?ä¹¦"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:36
+msgid "This certificate has been verified for the following uses:"
+msgstr "æ¤è¯?ä¹¦å·²ç»?è¢«ä¸?å??ç?¨æ?·æ??éª?è¯?ï¼?"
+
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust the authenticity of this certificate"
 msgstr "ä¿¡ä»»æ¤è¯?ä¹¦ç??é¢?å??æ?ºæ??"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify email users."
 msgstr "ä¿¡ä»»æ¤é¢?å??æ?ºæ??æ ?è¯?ç??ç?µå?é?®ä»¶ç?¨æ?·ã??"
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "ä¿¡ä»»æ¤é¢?å??æ?ºæ??æ ?è¯?ç??è½¯ä»¶å¼?å??è??ã??"
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "ä¿¡ä»»æ¤é¢?å??æ?ºæ??æ ?è¯?ç??ç½?ç«?ã??"
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:41
+msgid "Validity"
+msgstr "æ??æ??æ?§"
+
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "View"
 msgstr "æ?¥ç??"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "æ?¨æ?¥æ??è¿?äº?ç»?ç»?è¯?æ??æ?¨èº«ä»½ç??è¯?ä¹¦ï¼?"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.ui.h:44
 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:45
 msgid "You have certificates on file that identify these people:"
 msgstr "æ?¨æ?¥æ??è¯?æ??è¿?äº?äººç??æ??ä»¶å??è¯?ä¹¦ï¼?"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "Your Certificates"
 msgstr "æ?¨ç??è¯?ä¹¦"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:47
 msgid "_Edit CA Trust"
 msgstr "ç¼?è¾? CA ä¿¡ä»»(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "è¯?ä¹¦å·²ç»?å?å?¨"
 
@@ -20690,161 +20120,161 @@ msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "ç¾å??"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "å? å¯?"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "ç??æ?¬"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "ç??æ?¬ 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "ç??æ?¬ 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "ç??æ?¬ 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "å¸¦ RSA å? å¯?ç?? PKCS #1 MD2"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "å¸¦ RSA å? å¯?ç?? PKCS #1 MD5"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "å¸¦ RSA å? å¯?ç?? PKCS #1 SHA-1"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "è¯?ä¹¦å¯?é?¥ç?¨é??"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape è¯?ä¹¦ç±»å??"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "è¯?ä¹¦é¢?å??å¯?é?¥èº«ä»½"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "å¯¹è±¡æ ?è¯?ç¬¦(%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "ç®?æ³?æ ?è¯?ç¬¦"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "ç®?æ³?å??æ?°"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "ä¸»é¢?å?¬é?¥ä¿¡æ?¯"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "ä¸»é¢?å?¬é?¥ç®?æ³?"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "ä¸»é¢?å?¬é?¥"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "é??è¯¯ï¼?æ? æ³?å¤?ç??æ?©å±?"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "å¯¹è±¡ç¾å??è??"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL è¯?ä¹¦é¢?å??æ?ºæ??"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "ç?µå?é?®ä»¶è¯?ä¹¦é¢?å??æ?ºæ??"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "ç¾å??"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "ä¸?å?¯æ?µèµ?"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "å¯?é?¥ç¼?ç ?å?¨"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "æ?°æ?®ç¼?ç ?å?¨"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "å¯?é?¥å??è®®"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "è¯?ä¹¦ç¾å??è??"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL ç¾å??è??"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "å?³é?®"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "é??å?³é?®"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "æ?©å±?"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "è¯?ä¹¦ç¾å??ç®?æ³?"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "å??è¡?è??"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "å??è¡?è??å?¯ä¸? ID"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "ä¸»é¢?å?¯ä¸? ID"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "è¯?ä¹¦ç¾å??å?¼"
 
@@ -20860,1326 +20290,6 @@ msgstr "è¾?å?¥ PKCS12 æ??ä»¶ç??å¯?ç ?ï¼?"
 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 "ç²?è´´å?ªè´´æ?¿"
-
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-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 "å°?å?°å??ç°¿å?¦å?ä¸º VCard(_A)"
-
-#: ../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:2724
-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 "è??ç³»äººå?¦å?ä¸º VCard(_S)..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "æ??ä»¶å¤¹è??ç³»äººå?¦å?ä¸º VCard(_S)"
-
-#: ../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:195
-msgid "Next"
-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:74
-#: ../widgets/misc/e-calendar.c:171
-msgid "Previous"
-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:115
-#: ../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 "Pos_t New Message to Folder"
-msgstr "æ??æ?°ä¿¡ä»¶æ??é??å?°æ??ä»¶å¤¹(_T)"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "æ??é??å??å¤?(_Y)"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "æ??ä¿¡ä»¶ä¿?å?å?°å?¬å?±æ??ä»¶å¤¹ä¸"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "å?¨å?¬å?±æ??ä»¶å¤¹ä¸å??å¤?ä¿¡ä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:72
-msgid "Pr_evious Important Message"
-msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡ä»¶(_E)"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Preview the message to be printed"
-msgstr "é¢?è§?è¦?æ??å?°ç??ä¿¡ä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:77
-msgid "Print this message"
-msgstr "æ??å?°è¯¥ä¿¡ä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:78
-msgid "Re_direct"
-msgstr "é??å??(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:79
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "å°?é??ä¸ä¿¡ä»¶é??å??(é??å??)ç»?æ??äºº"
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Reset the text to its original size"
-msgstr "æ??æ??æ?¬é??æ?°è®¾ç½®ä¸ºå??æ?¥ç??å¤§å°?"
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the selected messages as a text file"
-msgstr "æ??é??ä¸ä¿¡ä»¶å?¦å?ä¸ºæ??æ?¬æ??ä»¶"
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search Folder from Mailing _List..."
-msgstr "å?ºäº?é?®ä»¶å??è¡¨ç??æ??ç´¢æ??ä»¶å¤¹(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipien_ts..."
-msgstr "å?ºäº?æ?¶ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_T)..."
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Search Folder from S_ubject..."
-msgstr "å?ºäº?ä¸»é¢?ç??æ??ç´¢æ??ä»¶å¤¹(_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:89
-msgid "Search Folder from Sen_der..."
-msgstr "å?ºäº?å??ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_D)..."
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Search for text in the body of the displayed message"
-msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??ä¸»ä½?ä¸æ??ç´¢æ??æ?¬"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Select _All Text"
-msgstr "é??ä¸æ??æ??æ??å?(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Select all the text in a message"
-msgstr "é??ä¸ä¿¡ä»¶ä¸ç??å?¨é?¨æ??æ?¬"
-
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "è®¾å®?æ?¨å½?å??æ??å?°æ?ºç??é¡µé?¢è®¾ç½®"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "å?¨æ?¾ç¤ºä¿¡ä»¶ç??ä¿¡ä½?ä¸æ?¾ç¤ºé?ªç??å??æ ?"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages with all email headers"
-msgstr "æ?¾ç¤ºé?®ä»¶æ?¶æ?¾ç¤ºæ??æ??ä¿¡å¤´"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show the raw email source of the message"
-msgstr "æ?¾ç¤ºä¿¡ä»¶ç??å??å§?é?®ä»¶æº?ä»£ç ?"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "Undelete the selected messages"
-msgstr "å??æ¶?é??ä¸ä¿¡ä»¶ç??å? é?¤"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "Uni_mportant"
-msgstr "ä¸?é??è¦?(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Zoom _Out"
-msgstr "ç¼©å°?(_O)"
-
-#: ../ui/evolution-mail-message.xml.h:100
-msgid "_Attached"
-msgstr "é??ä»¶(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Caret Mode"
-msgstr "å??æ ?æ¨¡å¼?(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:102
-msgid "_Clear Flag"
-msgstr "æ¸?é?¤æ ?å¿?(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:105
-msgid "_Delete Message"
-msgstr "å? é?¤ä¿¡ä»¶(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Find in Message..."
-msgstr "å?¨ä¿¡ä»¶ä¸æ?¥æ?¾(_F)..."
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Flag Completed"
-msgstr "æ ?å¿?ä¸ºå·²å®?æ??(_F)"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Go To"
-msgstr "è½¬å?°(_G)"
-
-#: ../ui/evolution-mail-message.xml.h:111
-msgid "_Important"
-msgstr "é??è¦?(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Inline"
-msgstr "åµ?å?¥(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Junk"
-msgstr "å??å?¾(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Load Images"
-msgstr "è£?å?¥å?¾å??(_L)"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Message Source"
-msgstr "ä¿¡ä»¶æº?ä»£ç ?(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Next Message"
-msgstr "ä¸?ä¸?å°?ä¿¡(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:119
-msgid "_Normal Size"
-msgstr "æ?®é??å¤§å°?(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Not Junk"
-msgstr "é??å??å?¾(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:121
-msgid "_Open in New Window"
-msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?(_O)"
-
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Previous Message"
-msgstr "ä¸?ä¸?å°?ä¿¡(_P)"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Quoted"
-msgstr "å¼?ç?¨(_Q)"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "è¯»å??(_R)"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Save Message..."
-msgstr "ä¿?å?ä¿¡ä»¶(_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:129
-msgid "_Undelete Message"
-msgstr "å??æ¶?å? é?¤ä¿¡ä»¶(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:130
-msgid "_Unread"
-msgstr "æ?ªè¯»(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "ç¼©æ?¾(_Z)"
-
-#: ../ui/evolution-mail-message.xml.h:132
-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 "ä»?å?ªè´´æ?¿ä¸ç²?è´´å¤?å¿?"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-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 "ä»?å?ªè´´æ?¿ä¸ç²?è´´ä»»å?¡"
-
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-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 "å¸¸è§?é?®ç?(FAQ)(_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 "çª?å?£(_W)"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "æ??å?¬å?¸(_C)"
@@ -22253,31 +20363,27 @@ 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:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:418
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:422
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:761
 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"
@@ -22286,168 +20392,275 @@ msgstr ""
 "ç?¨é¼ æ ?å·¦é?®æ?¾å¤§å?°å?¾ç??æ??ä¸ªå?ºå??å¹¶é??æ?©æ?¶å?ºã??\n"
 "ç?¨é¼ æ ?å?³é?®ç¼©å°?ã??"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../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:358
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:350
+#: ../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:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:360
 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-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "è¡¨æ ¼"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "å®?ä¾?"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../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:581
-#: ../widgets/menus/gal-view-menus.c:367
-msgid "Custom View"
-msgstr "å½?å??è§?å?¾"
-
-#: ../widgets/menus/gal-view-instance.c:582
-msgid "Save Custom View"
-msgstr "ä¿?å?è?ªå®?ä¹?è§?å?¾"
-
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
-msgid "Define Views..."
-msgstr "å®?ä¹?è§?å?¾..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "å½?å??è§?å?¾(_U)"
-
-#: ../widgets/menus/gal-view-menus.c:328
-#, c-format
-msgid "Select View: %s"
-msgstr "é??æ?©è§?å?¾ï¼?%s"
-
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Current view is a customized view"
-msgstr "å½?å??è§?å?¾ä¸ºè?ªå®?ä¹?è§?å?¾"
-
-#: ../widgets/menus/gal-view-menus.c:377
-msgid "Save Custom View..."
-msgstr "ä¿?å?å½?å??è§?å?¾..."
-
-#: ../widgets/menus/gal-view-menus.c:382
-msgid "Save current custom view"
-msgstr "ä¿?å?å½?å??è?ªå®?ä¹?è§?å?¾"
-
-#: ../widgets/menus/gal-view-menus.c:396
-msgid "Create or edit views"
-msgstr "å??å»ºæ??ç¼?è¾?è§?å?¾"
-
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "å·¥å??"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:99
 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-bar.c:1132
-msgid "Attachment Bar"
-msgstr "é??ä»¶æ ?"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "é»?è®¤(_F)"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "æ? æ³?é??å? æ??ä»¶ %sï¼?%s"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "è´¦æ?·å??"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "æ? æ³?é??å? æ??ä»¶ %sï¼?ä¸?æ?¯æ?®é??æ??ä»¶"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "å??è®®"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-action-combo-box.c:388
+msgid "Action"
+msgstr "æ´»å?¨"
+
+#: ../widgets/misc/e-action-combo-box.c:389
+msgid "A GtkRadioAction"
+msgstr ""
+
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "é??ä»¶å±?æ?§"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "æ??ä»¶å??ï¼?"
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "æ??ä»¶å??(_F)ï¼?"
+
+#: ../widgets/misc/e-attachment-dialog.c:363
+msgid "MIME Type:"
+msgstr "MIME  ç±»å??ï¼?"
+
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
+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.glade.h:4
-msgid "MIME type:"
-msgstr "MIME ç±»å??ï¼?"
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "è®¾ä¸ºè??æ?¯(_B)"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "å»ºè®®è?ªå?¨æ?¾ç¤ºé??ä»¶"
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "ä¸?è?½å??é??é??ä»¶"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "å??é??å?°(_S)..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#, fuzzy
+msgid "Send the selected attachments somewhere"
+msgstr "é??æ?©ä¿?å?é??ä¸é??ä»¶ç??æ??ä»¶å¤¹..."
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "è£?å?¥"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "ä¿?å?"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "é??è??é??ä»¶æ ?(_A)"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "æ?¾ç¤ºé??ä»¶æ ?(_A)"
+
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "Add Attachment"
+msgstr "æ·»å? é??ä»¶"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "é??ä»¶(_T)"
+
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "ä¿?å?é??ä»¶"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:636
+#: ../widgets/misc/e-attachment.c:1768 ../widgets/misc/e-attachment.c:2294
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "å?¨é?¨ä¿?å?(_A)"
+
+#: ../widgets/misc/e-attachment-view.c:326
+msgid "A_dd Attachment..."
+msgstr "æ·»å? é??ä»¶(_D)..."
+
+#: ../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\""
+msgstr "ä½¿ç?¨â??%sâ??æ??å¼?"
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "å?¨ %s ä¸æ??å¼?é??ä»¶"
+
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr "é??å? ç??ä¿¡æ?¯"
+
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2596
+msgid "A load operation is already in progress"
+msgstr "ä¸?ä¸ªå·²ç»?å? è½½ç??æ??ä½?æ£å?¨è¿?è¡?"
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2604
+msgid "A save operation is already in progress"
+msgstr "ä¸ªå·²ç»?ä¿?å?ç??æ??ä½?æ£å?¨è¿?è¡?"
+
+#: ../widgets/misc/e-attachment.c:1914
+#, c-format
+msgid "Could not load '%s'"
+msgstr "ä¸?è?½å? è½½â??%sâ??"
+
+#: ../widgets/misc/e-attachment.c:1917
+#, c-format
+msgid "Could not load the attachment"
+msgstr "ä¸?è?½å? è½½é??ä»¶"
+
+#: ../widgets/misc/e-attachment.c:2174
+#, c-format
+msgid "Could not open '%s'"
+msgstr "ä¸?è?½æ??å¼?â??%sâ??"
+
+#: ../widgets/misc/e-attachment.c:2177
+#, c-format
+msgid "Could not open the attachment"
+msgstr "ä¸?è?½æ??å¼?é??ä»¶"
+
+#: ../widgets/misc/e-attachment.c:2612
+#, fuzzy
+msgid "Attachment contents not loaded"
+msgstr "é??ä»¶æ??é??"
+
+#: ../widgets/misc/e-attachment.c:2688
+#, c-format
+msgid "Could not save '%s'"
+msgstr "ä¸?è?½ä¿?å?â??%sâ??"
+
+#: ../widgets/misc/e-attachment.c:2691
+#, fuzzy, c-format
+msgid "Could not save the attachment"
+msgstr "é??æ?©ä¿?å?å?¨é?¨é??ä»¶ç??æ??ä»¶å¤¹..."
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../widgets/misc/e-buffer-tagger.c:359
+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:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%Yå¹´%B"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "æ??å??"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
-#: ../widgets/text/e-text.c:3645
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 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:3651
-#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
-#: ../widgets/text/e-text.c:3660
+#: ../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
 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:3666
-#: ../widgets/text/e-text.c:3667
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "ç?¹ç»?å¡«å??"
 
@@ -22471,271 +20684,171 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:999
-#: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/misc/e-canvas-vbox.c:89
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:649
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "æ??å°?å®½åº¦"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1000
-#: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/misc/e-canvas-vbox.c:90
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "æ??å°?å®½åº¦"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "é?´è·?"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
-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:77
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "ç?¾å??æ¯?å?¼å¿?é??å?¨ 0 å?° 100 ä¹?é?´ï¼?å?« 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 "Unicode"
-
-#: ../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:303
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "æ?¥æ??å??æ?¶é?´"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:543
 msgid "Text entry to input date"
 msgstr "è¾?å?¥æ?¥æ??ç??æ??æ?¬æ¡?"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:565
 msgid "Click this button to show a calendar"
 msgstr "å??å?»æ¤æ??é?®å?¯æ?¾ç¤ºæ?¥å??"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:607
 msgid "Drop-down combination box to select time"
 msgstr "é??æ?©æ?¶é?´ç??ç»?å??æ¡?"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:683
 msgid "No_w"
 msgstr "ç?°å?¨(_W)"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:689
 msgid "_Today"
 msgstr "ä»?å¤©(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:697
+msgid "_None"
+msgstr "æ? (_N)"
+
+#: ../widgets/misc/e-dateedit.c:1797
 msgid "Invalid Date Value"
 msgstr "æ? æ??ç??æ?¥æ??å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1664
+#: ../widgets/misc/e-dateedit.c:1833
 msgid "Invalid Time Value"
 msgstr "æ? æ??ç??æ?¶é?´å?¼"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "å·²å±?å¼?"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "æ?¯å?¦å±?å¼?æ?©å±?å?¨"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "æ?©å±?å?¨æ ?ç¾ç??æ??æ?¬"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "ä½¿ç?¨ä¸?å??çº¿"
-
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-import-assistant.c:239
 msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr "å¦?æ??è®¾ç½®äº?æ¤é??é¡¹ï¼?å°?ä¼?å?¨è¡¨æ??å? é??é?®ç??å?ç¬¦ä¸?é?¢å? ä¸?å??çº¿"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "æ ?ç¾å??å?¶å?ç©ºé?´ä¸é?´ç??é?´è·?"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "æ ?ç¾é?¨ä»¶"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr "é??æ?©æ?¨å¸?æ??å¯¼å?¥å?° Evolution ç??æ??ä»¶ï¼?å¹¶ä»?å??è¡¨ä¸é??æ?©æ??ä»¶ç??ç±»å??ã??"
 
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "å?¨é??å¸¸æ?©å±?å?¨æ ?ç¾ç??ä½?ç½®æ?¾ç¤ºç??é?¨ä»¶"
+#: ../widgets/misc/e-import-assistant.c:256
+msgid "F_ilename:"
+msgstr "æ??ä»¶å??(_I)ï¼?"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "æ?©å±?å?¨å¤§å°?"
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "Select a file"
+msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "æ?©å±?å?¨ç®å¤´ç??å¤§å°?"
+#: ../widgets/misc/e-import-assistant.c:280
+#: ../widgets/misc/e-import-assistant.c:456
+msgid "File _type:"
+msgstr "æ??ä»¶ç±»å??(_T)ï¼?"
 
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "æ ?è¯?å?¨é?´è·?"
+#: ../widgets/misc/e-import-assistant.c:323
+msgid "Choose the destination for this import"
+msgstr "é??æ?©æ¤å¯¼å?¥ç??ç?®ç??ä½?ç½®"
 
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "æ?©å±?å?¨ç®å¤´æ??è¾¹ç??é?´è·?"
+#: ../widgets/misc/e-import-assistant.c:348
+msgid "Choose the type of importer to run:"
+msgstr "é??æ?©è¦?è¿?è¡?ç??å¯¼å?¥å?¨ç±»å??ï¼?"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
-#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
-msgid "Advanced Search"
-msgstr "é«?çº§æ??ç´¢"
+#: ../widgets/misc/e-import-assistant.c:356
+msgid "Import data and settings from _older programs"
+msgstr "ä»?æ?§ç??ç¨?åº?ä¸å¯¼å?¥æ?°æ?®å??è®¾ç½®(_O)"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:230
-msgid "Save Search"
-msgstr "ä¿?å?æ??ç´¢"
+#: ../widgets/misc/e-import-assistant.c:364
+msgid "Import a _single file"
+msgstr "å¯¼å?¥å??ä¸ªæ??ä»¶(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:267
-msgid "_Searches"
-msgstr "æ??ç´¢(_S)"
+#: ../widgets/misc/e-import-assistant.c:440
+msgid "Select what type of file you want to import from the list."
+msgstr ""
 
-#: ../widgets/misc/e-filter-bar.c:269
-msgid "Searches"
-msgstr "æ??ç´¢"
+#: ../widgets/misc/e-import-assistant.c:517
+#, fuzzy
+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ã??\n"
+"iCalendarã??å¹¶æ?ªå??ç?°å?¯å¯¼å?¥ç??è®¾ç½®ã??å¦?æ??æ?¨æ?³è¦?å??è¯?ä¸?æ¬¡ï¼?è¯·å??å?»\n"
+"â??ä¸?ä¸?æ¥â??æ??é?®ã??\n"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
-msgid "_Save Search..."
-msgstr "ä¿?å?æ??ç´¢(_S)..."
+#: ../widgets/misc/e-import-assistant.c:1181
+#: ../widgets/misc/e-import-assistant.c:1208
+msgid "Evolution Import Assistant"
+msgstr "Evolution å¯¼å?¥å?©æ??"
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
-msgid "_Edit Saved Searches..."
-msgstr "ç¼?è¾?ä¿?å?ç??æ??ç´¢(_E)..."
+#: ../widgets/misc/e-import-assistant.c:1190
+#: ../widgets/misc/e-import-assistant.c:1242
+msgid "Import Location"
+msgstr "å¯¼å?¥ä½?ç½®"
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
-msgid "_Advanced Search..."
-msgstr "é«?çº§æ??ç´¢(_A)..."
+#: ../widgets/misc/e-import-assistant.c:1201
+#, fuzzy
+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-filter-bar.h:107
-msgid "All Accounts"
-msgstr "å?¨é?¨è´¦æ?·"
+#: ../widgets/misc/e-import-assistant.c:1217
+msgid "Importer Type"
+msgstr "å¯¼å?¥å?¨ç±»å??"
 
-#: ../widgets/misc/e-filter-bar.h:108
-msgid "Current Account"
-msgstr "å½?å??è´¦æ?·"
+#: ../widgets/misc/e-import-assistant.c:1226
+msgid "Select Information to Import"
+msgstr "é??æ?©è¦?å¯¼å?¥ç??ä¿¡æ?¯"
 
-#: ../widgets/misc/e-filter-bar.h:109
-msgid "Current Folder"
-msgstr "å½?å??æ??ä»¶å¤¹"
+#: ../widgets/misc/e-import-assistant.c:1234
+msgid "Select a File"
+msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "å½?å??ä¿¡ä»¶"
+#: ../widgets/misc/e-import-assistant.c:1249
+#, fuzzy
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "å??å?»â??å¯¼å?¥â??ä»¥ä¾¿å¼?å§?å°?æ??ä»¶å¯¼å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-image-chooser.c:169
-msgid "Choose Image"
-msgstr "é??æ?©å?¾å??"
+#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1265
+msgid "Import Data"
+msgstr "å¯¼å?¥æ?°æ?®"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "ä¸?ç??å?°å?¾"
 
-#: ../widgets/misc/e-map.c:629
+#: ../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."
@@ -22743,278 +20856,334 @@ msgstr ""
 "å?ºäº?é¼ æ ?äº¤äº?ç??å?°å?¾é?¨ä»¶ï¼?å?¯ç?¨æ?¥é??æ?©æ?¶å?ºã??é?®ç??ç?¨æ?·å?¯ä»¥ä»?ä¸?æ?¹ç??ç»?å??æ¡?ä¸é??æ?©æ?¶"
 "å?ºã??"
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "å?¨çº¿"
+#: ../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:30
+msgid "Evolution is currently offline.  Click this button to work online."
+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:102
+#: ../widgets/misc/e-paned.c:244
+#, fuzzy
+msgid "Horizontal Position"
+msgstr "æ°´å¹³é?¢æ?¿ä½?ç½®"
+
+#: ../widgets/misc/e-paned.c:245
+msgid "Pane position when oriented horizontally"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:256
+#, fuzzy
+msgid "Vertical Position"
+msgstr "å??ç?´é?¢æ?¿ç??ä½?ç½®"
+
+#: ../widgets/misc/e-paned.c:257
+msgid "Pane position when oriented vertically"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "å??æ¥å¯¹è±¡ï¼?"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "å??æ¥ç§?æ??è®°å½?ï¼?"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "å??æ¥ç±»å?«ï¼?"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
-msgid "Empty message"
-msgstr "ç©ºä¿¡ä»¶"
-
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
-msgid "Reflow model"
-msgstr "å??æµ?æ¨¡å??"
-
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
-msgid "Column width"
-msgstr "å??å®½"
-
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
-msgid "Search"
-msgstr "æ??ç´¢"
-
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
-msgid "Click here to change the search type"
-msgstr "å??å?»æ¤å¤?æ?´æ?¹æ??ç´¢ç±»å??"
-
-#: ../widgets/misc/e-search-bar.c:603
-msgid "_Search"
-msgstr "æ??ç´¢(_S)"
-
-#: ../widgets/misc/e-search-bar.c:609
-msgid "_Find Now"
-msgstr "ç«?å?³æ?¥æ?¾(_F)"
-
-#: ../widgets/misc/e-search-bar.c:610
-msgid "_Clear"
-msgstr "æ¸?é?¤(_C)"
-
-#: ../widgets/misc/e-search-bar.c:865
-msgid "Item ID"
-msgstr "é¡¹ç?® ID"
-
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
-#: ../widgets/text/e-text.c:3567
-msgid "Text"
-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:1003
-msgid "Sho_w: "
-msgstr "æ?¾ç¤º(_W)ï¼?"
-
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
-msgid "Sear_ch: "
-msgstr "æ??ç´¢(_C)ï¼?"
-
-#. 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:1032
-msgid " i_n "
-msgstr " äº?(_N) "
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "Evolution é¦?é??é¡¹"
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "å??æ ?è¡?"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "å??æ ?å??"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "æ??åº?"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "é??æ?©æ¨¡å¼?"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "å??æ ?æ¨¡å¼?"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../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:7
+#: ../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:8
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "å·²å??é??å??å·²æ??å¼?(_V)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.ui.h:5
+#, fuzzy
+msgid "Delivery Options"
+msgstr "<b>å??é??é??é¡¹</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+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:10
-msgid ""
-"None\n"
-"Mail Receipt"
+#: ../widgets/misc/e-send-options.ui.h:10
+#, fuzzy
+msgid "Mail Receipt"
 msgstr ""
 "æ? \n"
 "é??è¯»æ?¶æ?¡"
 
-#: ../widgets/misc/e-send-options.glade.h:12
-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.ui.h:13
+#, fuzzy
+msgid "Proprietary"
+msgstr "ä¼?å??çº§"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.ui.h:14
 msgid "R_eply requested"
 msgstr "è¯·æ±?å??å¤?(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.ui.h:16
+#, fuzzy
+msgid "Return Notification"
+msgstr "<b>è¿?å??é??ç?¥</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Sta_tus Tracking"
 msgstr "ç?¶æ??è·?è¸ª(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"æ?ªå®?ä¹?\n"
-"é«?\n"
-"æ ?å??\n"
-"ä½?"
+#: ../widgets/misc/e-send-options.ui.h:20
+msgid "Standard"
+msgstr "æ ?å??"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:21
+#, fuzzy
+msgid "Status Tracking"
+msgstr "ç?¶æ??è·?è¸ª(_T)"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Top Secret"
+msgstr "ç»?å¯?"
+
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "When acce_pted:"
 msgstr "æ?¥å??æ?¶(_P)ï¼?"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When co_mpleted:"
 msgstr "å®?æ??æ?¶(_M)ï¼?"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When decli_ned:"
 msgstr "æ??ç»?æ?¶(_N)ï¼?"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Wi_thin"
 msgstr "å°?äº?(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "_After:"
 msgstr "ä¹?å??(_A)ï¼?"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_All information"
 msgstr "å?¨é?¨ä¿¡æ?¯(_A)"
 
-#. 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:30
+#, fuzzy
+msgid "_Classification:"
+msgstr "å??ç±»(_C)"
+
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_Delay message delivery"
 msgstr "æ?¨è¿?ä¿¡ä»¶æ??é??(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delivered"
 msgstr "å·²æ??é??(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Set expiration date"
 msgstr "è®¾ç½®è¿?æ??æ?¶é?´(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Until:"
 msgstr "ç?´å?°(_U)ï¼?"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_When convenient"
 msgstr "æ?¹ä¾¿æ?¶(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:37
 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:252
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:130
+#: ../widgets/misc/e-signature-editor.c:489
+#: ../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:258
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% å®?æ??)"
+#: ../widgets/misc/e-signature-editor.c:207
+msgid "_Save and Close"
+msgstr "ä¿?å?å¹¶å?³é?(_S)"
+
+#: ../widgets/misc/e-signature-editor.c:361
+msgid "Edit Signature"
+msgstr "ç¼?è¾?ç¾å??"
+
+#: ../widgets/misc/e-signature-editor.c:376
+msgid "_Signature Name:"
+msgstr "ç¾å??(_S)ï¼?"
+
+#: ../widgets/misc/e-signature-manager.c:294
+#, fuzzy
+msgid "Add Signature Script"
+msgstr "æ·»å? ç¾å??è??æ?¬"
+
+#: ../widgets/misc/e-signature-manager.c:359
+#, fuzzy
+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
+#, fuzzy
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"æ¤è??æ?¬ç??è¾?å?ºå°?ç?¨äº?æ?¨ç??ç¾å??ã??æ?¨æ??å®?ç??å??ç§°å°?å?ªä¼?\n"
+"ç?¨äº?æ?¾ç¤ºã??"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-signature-script-dialog.c:311
+#, fuzzy
+msgid "S_cript:"
+msgstr "è??æ?¬(_S)ï¼?"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+#, fuzzy
+msgid "Script file must be executable."
+msgstr "è??æ?¬æ??ä»¶å¿?é¡»å?å?¨ä¸?å?¯æ?§è¡?ã??"
+
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "å??å?»æ¤å¤?è½¬å?° URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "ç¼?è¾?ä¸»ç±»å?«å??è¡¨..."
+#: ../widgets/misc/e-web-view.c:340
+msgid "_Copy Link Location"
+msgstr "å¤?å?¶é?¾æ?¥ä½?ç½®(_C)"
 
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "å±?äº?è¿?äº?ç±»å?«ç??é¡¹ç?®(_C)ï¼?"
+#: ../widgets/misc/e-web-view.c:342
+#, fuzzy
+msgid "Copy the link to the clipboard"
+msgstr "å°?é??ä¸æ??å?å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "å?¯ç?¨ç±»å?«(_A)ï¼?"
+#: ../widgets/misc/e-web-view.c:350
+msgid "_Open Link in Browser"
+msgstr "å?¨æµ?è§?å?¨ä¸æ??å¼?é?¾æ?¥(_O)"
 
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "ç±»å?«"
+#: ../widgets/misc/e-web-view.c:352
+#, fuzzy
+msgid "Open the link in a web browser"
+msgstr "å?¨æµ?è§?å?¨ä¸æ??å¼?é?¾æ?¥(_O)"
+
+#: ../widgets/misc/e-web-view.c:360
+msgid "_Copy Email Address"
+msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??(_C)"
+
+#: ../widgets/misc/e-web-view.c:379
+msgid "Copy the selection to the clipboard"
+msgstr "å¤?å?¶é??æ?©å?°å?ªè´´æ?¿"
+
+#: ../widgets/misc/e-web-view.c:389
+msgid "Select all text and images"
+msgstr "é??ä¸å?¨é?¨æ??æ?¬å??å?¾å??"
+
+#: ../widgets/misc/e-web-view.c:710 ../widgets/misc/e-web-view.c:712
+#: ../widgets/misc/e-web-view.c:714
+#, c-format
+msgid "Click to call %s"
+msgstr "å??å?»ä»¥å?¼å?« %s"
+
+#: ../widgets/misc/e-web-view.c:716
+msgid "Click to hide/unhide addresses"
+msgstr "å??å?»å?¯é??è??/æ?¾ç¤ºå?°å??"
+
+#: ../widgets/misc/e-web-view.c:718
+#, c-format
+msgid "Click to open %s"
+msgstr "å??å?»ä»¥æ??å¼? %s"
+
+#: ../widgets/misc/ea-calendar-item.c:295
+#: ../widgets/misc/ea-calendar-item.c:301
+msgid "%d %B %Y"
+msgstr "%Yå¹´%-mæ??%-dæ?¥"
+
+#: ../widgets/misc/ea-calendar-item.c:303
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "æ?¥å??ï¼?ä»? %s å?° %s"
+
+#: ../widgets/misc/ea-calendar-item.c:338
+msgid "evolution calendar item"
+msgstr "Evolution æ?¥å??é¡¹ç?®"
 
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "å¼¹å?ºå??è¡¨"
 
-#: ../widgets/table/e-cell-date.c:62
-msgid "%l:%M %p"
-msgstr "%p%l:%M"
+#: ../widgets/table/e-cell-date-edit.c:296
+msgid "Now"
+msgstr "ç?°å?¨"
+
+#: ../widgets/table/e-cell-date-edit.c:320
+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 ä¹?é?´ï¼?å?« 0 å?? 100"
 
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
@@ -23028,457 +21197,2330 @@ msgstr "è??ç?¦å??"
 msgid "Unselected Column"
 msgstr "æ?ªé??å??"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Strikeout Column"
 msgstr "ç»?å??å? å? é?¤çº¿"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Underline Column"
 msgstr "ç»?å??å? ä¸?å??çº¿"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Bold Column"
 msgstr "ç»?å??å? ç²?"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Color Column"
 msgstr "ç»?å??ç??è?²"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1836
 msgid "BG Color Column"
 msgstr "ç»?å??ç??è??æ?¯è?²"
 
-#: ../widgets/table/e-table-config.c:152
+#: ../widgets/table/e-table-click-to-add.c:576
+#: ../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:151
 msgid "State"
 msgstr "ç?¶æ??"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
 msgid "(Ascending)"
 msgstr "(å??åº?)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
 msgid "(Descending)"
 msgstr "(é??åº?)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:389
 msgid "Not sorted"
 msgstr "æ?ªæ??åº?"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:430
 msgid "No grouping"
 msgstr "æ?ªå??ç»?"
 
-#: ../widgets/table/e-table-config.c:643
-#: ../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:664
+#: ../widgets/table/e-table-config.c:657
 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:1582
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1580
 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:1582
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1580
 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:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "æ??æ?¾ä»£ç ?"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "å®?æ?´æ ?é¢?"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 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."
 msgstr "è¦?å?¨æ?¨ç??è¡¨æ ¼ä¸æ·»å? å??ï¼?è¯·å°?å?¶æ??æ?³å?°æ?¨æ?³è¦?å?¶å?ºç?°ç??ä½?ç½®ã??"
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%sï¼?%s (%d é¡¹)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d é¡¹)"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
+#: ../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
 msgid "Alternating Row Colors"
 msgstr "äº¤æ?¿è¡?è?²"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
+#: ../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
 msgid "Horizontal Draw Grid"
 msgstr "æ°´å¹³ç»?å?¶ç½?æ ¼"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
+#: ../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
 msgid "Vertical Draw Grid"
 msgstr "å??ç?´ç»?å?¶ç½?æ ¼"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
+#: ../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
 msgid "Draw focus"
 msgstr "ç»?å?¶ç?¦ç?¹"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
+#: ../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
 msgid "Cursor mode"
 msgstr "å??æ ?æ¨¡å¼?"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
+#: ../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
 msgid "Selection model"
 msgstr "é??æ?©æ¨¡å??"
 
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
+#: ../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
 msgid "Length Threshold"
 msgstr "é?¿åº¦é??å?¼"
 
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-leaf.c:658
-#: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
+#: ../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
 msgid "Uniform row height"
 msgstr "ç»?ä¸?è¡?é«?"
 
-#: ../widgets/table/e-table-group-container.c:978
-#: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-group-leaf.c:652
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-leaf.c:656
+#: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "å?»ç»?"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1450
 msgid "Customize Current View"
 msgstr "è?ªå®?ä¹?å½?å??è§?å?¾"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Ascending"
 msgstr "å??åº?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "Sort _Descending"
 msgstr "é??åº?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "_Unsort"
 msgstr "æ?ªæ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By This _Field"
 msgstr "æ??è¯¥å??å??ç»?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "Group By _Box"
 msgstr "æ??æ?¹æ¡?å??ç»?(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Remove This _Column"
 msgstr "å? é?¤è¯¥å??(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Add a C_olumn..."
 msgstr "æ·»å? ä¸?å??(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "A_lignment"
 msgstr "å¯¹é½?(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "B_est Fit"
 msgstr "æ??ä½³å?¹é??(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "Format Column_s..."
 msgstr "æ ¼å¼?å??å??(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Custo_mize Current View..."
 msgstr "è?ªå®?ä¹?å½?å??è§?å?¾(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1540
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1558
 msgid "_Custom"
 msgstr "è?ªå®?ä¹?(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "å?ä½?æ??è¿°"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "æ??åº?ä¿¡æ?¯"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "æ ?"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "è¡¨å¤´"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "è¡¨æ ¼æ¨¡å??"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "å??æ ?è¡?"
 
-#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "æ??åº?ä¿¡æ?¯"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "æ?»æ?¯æ??ç´¢"
 
-#: ../widgets/table/e-table.c:3347
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "å??å?»å?¯æ·»å? "
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-table.c:3351
+#, fuzzy
+msgid "Vertical Row Spacing"
+msgstr "æ ?è¯?å?¨é?´è·?"
+
+#: ../widgets/table/e-table.c:3352
+msgid "Vertical space between rows. It is added to top and to bottom of a row"
+msgstr ""
+
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "æ ?"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree è¡¨æ ¼é??é??å?¨"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "ç?«ç®å¤?è§?"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "ç»?å?¶è¡?å?? +/- æ?©å±?æ??ã??"
 
-#: ../widgets/text/e-text.c:2736
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "æ?©å±?å?¨å¤§å°?"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "æ?©å±?å?¨ç®å¤´ç??å¤§å°?"
+
+#: ../widgets/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "å¼¹å?º"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+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:120
+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:2719
+msgid "Select All"
+msgstr "å?¨é??"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "è¾?å?¥æ³?"
 
-#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "äº?ä»¶å¤?ç??å?¨"
 
-#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
+#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
+msgid "Text"
+msgstr "æ??å?"
+
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "ç²?ä½?"
 
-#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "å? é?¤çº¿"
 
-#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "é??ç?¹"
 
-#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "ä¸¤ç«¯å¯¹é½?"
 
-#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "è£?å?ªå®½åº¦"
 
-#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "è£?å?ªé«?åº¦"
 
-#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "è£?å?ª"
 
-#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "å¡«å??è£?å?ªç?©å½¢"
 
-#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "æ°´å¹³å??ç§»"
 
-#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "å??ç?´å??ç§»"
 
-#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "æ??å?å®½åº¦"
 
-#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "æ??å?é«?åº¦"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "ä½¿ç?¨æ¤å??"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "æ¤å??"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "æ?¢è¡?"
 
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "æ?¢è¡?å?ç¬¦"
 
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "æ??å¤?è¡?æ?°"
 
-#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "ç»?å?¶è¾¹æ¡?"
 
-#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "å??è®¸æ?°è¡?"
 
-#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "ç»?å?¶è??æ?¯"
 
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "ç»?å?¶æ??é?®"
 
-#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "å??æ ?ä½?ç½®"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "è¾?å?¥æ³?ç?¯å¢?"
 
-#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "å¤?ç??å¼¹å?º"
+
+#~ msgid "Evolution Error"
+#~ msgstr "Evolution é??è¯¯"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "Evolution è¦å??"
+
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "å??é?¨é??è¯¯ï¼?è¯·æ±?äº?æ?ªç?¥ç??é??è¯¯â??%sâ??"
+
+#~ msgid "search bar"
+#~ msgstr "æ??ç´¢æ ?"
+
+#~ msgid "evolution calendar search bar"
+#~ msgstr "Evolution æ?¥å??å??æ??ç´¢æ ?"
+
+#~ msgid "Combo Button"
+#~ msgstr "ç»?å??æ??é?®"
+
+#~ msgid "Activate Default"
+#~ msgstr "æ¿?æ´»é»?è®¤"
+
+#~ msgid "Popup Menu"
+#~ msgstr "å¼¹å?ºè??å??"
+
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "å??æ?¢é??ä»¶æ ?"
+
+#~ msgid "activate"
+#~ msgstr "æ¿?æ´»"
+
+#~ msgid "C_ontacts"
+#~ msgstr "è??ç³»äºº(_O)"
+
+#~ msgid "Configure autocomplete here"
+#~ msgstr "å?¨æ¤é??ç½®è?ªå?¨è¡¥å?¨"
+
+#~ msgid "Evolution Address Book"
+#~ msgstr "Evolution å?°å??ç°¿"
+
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "Evolution å?°å??ç°¿å?°å??å¼¹å?ºæ¡?"
+
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "Evolution å?°å??ç°¿å?°å??æ?¥ç??å?¨"
+
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "Evolution å?°å??ç°¿å??ç??æ?¥ç??å?¨"
+
+#~ msgid "Evolution Address Book component"
+#~ msgstr "Evolution å?°å??ç°¿ç»?ä»¶"
+
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "Evolution S/MIME è¯?ä¹¦ç®¡ç??æ?§ä»¶"
+
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr "Evolution æ??ä»¶å¤¹é??ç½®æ?§ä»¶"
+
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "å?¨æ¤ç®¡ç??æ?¨ç?? S/MIME è¯?ä¹¦"
+
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr "å??çº§å?°å??ç°¿è®¾ç½®æ??æ??ä»¶å¤¹å¤±è´¥ã??"
+
+#~ msgid "Base"
+#~ msgstr "å?ºç¡?"
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "å°?â??%sâ??æ??ä»¶å¤¹é??å?½å??ä¸ºï¼?"
+
+#~ msgid "Rename Folder"
+#~ msgstr "é??å?½å??æ??ä»¶å¤¹"
+
+#~ msgid "Save As vCard..."
+#~ msgstr "å?¦å?ä¸º vCard..."
+
+#~ msgid "Contact Source Selector"
+#~ msgstr "è??ç³»äººæº?é??æ?©å?¨"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+#~ msgstr "å?¡ç??å??å??è¡¨è§?å?¾å??é¢?è§?é?¢æ?¿ä¹?é?´å??ç?´é?¢æ?¿ç??ä½?ç½®ï¼?ä»¥å??ç´ è®¡ã??"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>èº«ä»½éª?è¯?</b>"
+
+#~ msgid "<b>Downloading</b>"
+#~ msgstr "<b>ä¸?è½½</b>"
+
+#~ msgid "<b>Searching</b>"
+#~ msgstr "<b>æ??ç´¢</b>"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>ç±»å??ï¼?</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "æ·»å? å?°å??ç°¿"
+
+#~ msgid "Basic"
+#~ msgstr "å?ºæ?¬"
+
+#~ msgid "Distinguished name"
+#~ msgstr "è¯?å?«æ?§å??ç§°"
+
+#~ msgid "Email address"
+#~ msgstr "ç?µå?é?®ä»¶å?°å??"
+
+#~ msgid ""
+#~ "Evolution will use this email address to authenticate you with the server."
+#~ msgstr "Evolution å°?ä½¿ç?¨æ¤ç?µå?é?®ä»¶å?°å??å?¨æ??å?¡å?¨ä¸?å¯¹æ?¨è¿?è¡?è®¤è¯?ã??"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "æ?¥æ?¾å?¯è?½ç??æ??ç´¢å?ºç¡?"
+
+#~ msgid "Search filter"
+#~ msgstr "æ??ç´¢è¿?æ»¤å?¨"
+
+#~ 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)ã??å¦?æ??æ?¨å°?æ¤å¤?ç??ç©ºï¼?æ??ç´¢å°?ä»?ç?®å½?æ ?ç??"
+#~ "æ ¹å¼?å§?ã??"
+
+#~ msgid ""
+#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
+#~ "com\"."
+#~ msgstr "è¿?æ?¯æ?¨ç?? LDAP æ??å?¡å?¨ç??å®?æ?´å??å?ã??ä¾?å¦?ï¼?â??ldap.mycompany.comâ??ã??"
+
+#~ msgid ""
+#~ "This is the maximum number of entries to download. Setting this number to "
+#~ "be too large will slow down your address book."
+#~ msgstr "è¿?æ?¯å?¯ä¸?è½½æ?¡ç?®ç??æ??å¤§æ?°é??ã??å°?æ¤æ?°å?¼è®¾å®?å¾?å¤ªå¤§å°?å¯¼è?´å?°å??ç°¿å??æ?¢ã??"
+
+#~ msgid ""
+#~ "This is the name for this server that will appear in your Evolution "
+#~ "folder list. It is for display purposes only. "
+#~ msgstr "è¿?æ?¯æ¤æ??å?¡å?¨å?¨ Evolution æ??ä»¶å¤¹å??è¡¨ä¸æ?¾ç¤ºç??å??ç§°ã??å®?å?ªç?¨äº?æ?¾ç¤ºã??"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "å?¯è?½æ?¶"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "æ·»å? å?°å??ç°¿(_A)"
+
+#~ msgid "<b>Email</b>"
+#~ msgstr "<b>ç?µå?é?®ä»¶</b>"
+
+#~ msgid "<b>Home</b>"
+#~ msgstr "<b>å®¶åº</b>"
+
+#~ msgid "<b>Job</b>"
+#~ msgstr "<b>è??ä½?</b>"
+
+#~ msgid "<b>Miscellaneous</b>"
+#~ msgstr "<b>æ??é¡¹</b>"
+
+#~ msgid "<b>Other</b>"
+#~ msgstr "<b>å?¶å®?</b>"
+
+#~ msgid "<b>Telephone</b>"
+#~ msgstr "<b>ç?µè¯?</b>"
+
+#~ msgid "<b>Work</b>"
+#~ msgstr "<b>å·¥ä½?</b>"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN Messenger"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "Novell Groupwise"
+#~ msgstr "Novell Groupwise"
+
+#~ msgid "_Notes:"
+#~ msgstr "æ³¨é??(_N)ï¼?"
+
+#~ msgid "United States"
+#~ msgstr "ç¾?å?½"
+
+#~ msgid "Afghanistan"
+#~ msgstr "é?¿å¯?æ±?"
+
+#~ msgid "Albania"
+#~ msgstr "é?¿å°?å·´å°¼äº?"
+
+#~ msgid "Algeria"
+#~ msgstr "é?¿å°?å??å?©äº?"
+
+#~ msgid "American Samoa"
+#~ msgstr "ç¾?æ´²è?¨æ?©äº?"
+
+#~ msgid "Andorra"
+#~ msgstr "å®?é??å°?"
+
+#~ msgid "Angola"
+#~ msgstr "å®?å?¥æ??"
+
+#~ msgid "Anguilla"
+#~ msgstr "å®?å?æ??"
+
+#~ msgid "Antarctica"
+#~ msgstr "å??æ??æ´²"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "å®?æ??ç??å??å·´å¸?è¾¾"
+
+#~ msgid "Argentina"
+#~ msgstr "é?¿æ ¹å»·"
+
+#~ msgid "Armenia"
+#~ msgstr "äº?ç¾?å°¼äº?"
+
+#~ msgid "Aruba"
+#~ msgstr "é?¿é²?å·´å²?"
+
+#~ msgid "Australia"
+#~ msgstr "æ¾³å¤§å?©äº?"
+
+#~ msgid "Austria"
+#~ msgstr "å¥¥å?°å?©"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "é?¿å¡?æ??ç??"
+
+#~ msgid "Bahamas"
+#~ msgstr "å·´å??é©¬ç¾¤å²?"
+
+#~ msgid "Bahrain"
+#~ msgstr "å·´æ??å²?"
+
+#~ msgid "Bangladesh"
+#~ msgstr "å?å? æ??å?½"
+
+#~ msgid "Barbados"
+#~ msgstr "å·´å·´å¤?æ?¯å²?"
+
+#~ msgid "Belarus"
+#~ msgstr "ç?½ä¿?ç½?æ?¯"
+
+#~ msgid "Belgium"
+#~ msgstr "æ¯?å?©æ?¶"
+
+#~ msgid "Belize"
+#~ msgstr "ä¼¯å?©å?¹"
+
+#~ msgid "Benin"
+#~ msgstr "è´?å®?"
+
+#~ msgid "Bermuda"
+#~ msgstr "ç?¾æ??å¤§ç¾¤å²?"
+
+#~ msgid "Bhutan"
+#~ msgstr "ä¸?ä¸¹"
+
+#~ msgid "Bolivia"
+#~ msgstr "ç?»å?©ç»´äº?"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "æ³¢æ?¯å°¼äº?å??é»?èµ?å?¥ç»´çº³"
+
+#~ msgid "Botswana"
+#~ msgstr "å??è?¨ç?¦çº³"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "å¸?ç»´å²?"
+
+#~ msgid "Brazil"
+#~ msgstr "å·´è¥¿"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "è?±å±?å?°åº¦æ´?å?°å?º"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "æ??è?±å¾·é²?è?¨å?°"
+
+#~ msgid "Bulgaria"
+#~ msgstr "ä¿?å? å?©äº?"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "å¸?å?ºçº³æ³?ç´¢"
+
+#~ msgid "Burundi"
+#~ msgstr "å¸?é??è¿ª"
+
+#~ msgid "Cambodia"
+#~ msgstr "æ?¬å??å¯¨"
+
+#~ msgid "Cameroon"
+#~ msgstr "å??éº¦é??"
+
+#~ msgid "Canada"
+#~ msgstr "å? æ?¿å¤§"
+
+#~ msgid "Cape Verde"
+#~ msgstr "ä½?å¾?è§?"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "å¼?æ?¼ç¾¤å²?"
+
+#~ msgid "Central African Republic"
+#~ msgstr "ä¸é??å?±å??å?½"
+
+#~ msgid "Chad"
+#~ msgstr "ä¹?å¾?"
+
+#~ msgid "Chile"
+#~ msgstr "æ?ºå?©"
+
+#~ msgid "China"
+#~ msgstr "ä¸å?½"
+
+#~ msgid "Christmas Island"
+#~ msgstr "å?£è¯?å²?"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "ç§?ç§?æ?¯ç¾¤å²?"
+
+#~ msgid "Colombia"
+#~ msgstr "å?¥ä¼¦æ¯?äº?"
+
+#~ msgid "Comoros"
+#~ msgstr "ç§?æ?©ç½?ç¾¤å²?"
+
+#~ msgid "Congo"
+#~ msgstr "å??æ??"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "å??æ??äººæ°?æ°?ä¸»å?±å??å?½"
+
+#~ msgid "Cook Islands"
+#~ msgstr "åº?å??ç¾¤å²?"
+
+#~ msgid "Costa Rica"
+#~ msgstr "å?¥æ?¯è¾¾é»?å? "
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "ç§?ç?¹è¿ªç?¦"
+
+#~ msgid "Croatia"
+#~ msgstr "å??ç½?å?°äº?"
+
+#~ msgid "Cuba"
+#~ msgstr "å?¤å·´"
+
+#~ msgid "Cyprus"
+#~ msgstr "å¡?æµ¦è·¯æ?¯"
+
+#~ msgid "Czech Republic"
+#~ msgstr "æ?·å??å?±å??å?½"
+
+#~ msgid "Denmark"
+#~ msgstr "ä¸¹éº¦"
+
+#~ msgid "Djibouti"
+#~ msgstr "å??å¸?æ??ç¾¤å²?"
+
+#~ msgid "Dominica"
+#~ msgstr "å¤?ç±³å°¼å? "
+
+#~ msgid "Dominican Republic"
+#~ msgstr "å¤?ç±³å°¼å? å?±å??å?½"
+
+#~ msgid "Ecuador"
+#~ msgstr "å??ç??å¤?å°?"
+
+#~ msgid "Egypt"
+#~ msgstr "å??å??"
+
+#~ msgid "El Salvador"
+#~ msgstr "è?¨å°?ç?¦å¤?"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "èµ¤é??å? å??äº?"
+
+#~ msgid "Eritrea"
+#~ msgstr "å??ç«?ç?¹é??äº?"
+
+#~ msgid "Estonia"
+#~ msgstr "ç?±æ²?å°¼äº?"
+
+#~ msgid "Ethiopia"
+#~ msgstr "å??å¡?ä¿?æ¯?äº?"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "ç¦?å??å?°ç¾¤å²?"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "æ³?ç½?ç¾¤å²?"
+
+#~ msgid "Fiji"
+#~ msgstr "æ??æµ?"
+
+#~ msgid "Finland"
+#~ msgstr "è?¬å?°"
+
+#~ msgid "France"
+#~ msgstr "æ³?å?½"
+
+#~ msgid "French Guiana"
+#~ msgstr "æ³?å±?å?äº?é?£"
+
+#~ msgid "French Polynesia"
+#~ msgstr "æ³?å±?æ³¢å?©å°¼è¥¿äº?"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "æ³?å±?å??é?¨å?°å?º"
+
+#~ msgid "Gabon"
+#~ msgstr "å? è?¬"
+
+#~ msgid "Gambia"
+#~ msgstr "å??æ¯?äº?"
+
+#~ msgid "Georgia"
+#~ msgstr "æ ¼é²?å??äº?"
+
+#~ msgid "Germany"
+#~ msgstr "å¾·å?½"
+
+#~ msgid "Ghana"
+#~ msgstr "å? çº³"
+
+#~ msgid "Gibraltar"
+#~ msgstr "ç?´å¸?ç½?é??"
+
+#~ msgid "Greece"
+#~ msgstr "å¸?è??"
+
+#~ msgid "Greenland"
+#~ msgstr "æ ¼é?µå?°"
+
+#~ msgid "Grenada"
+#~ msgstr "æ ¼æ??çº³è¾¾"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "ç??å¾·ç½?æ?®å²?"
+
+#~ msgid "Guam"
+#~ msgstr "å?³å²?"
+
+#~ msgid "Guatemala"
+#~ msgstr "å?±å?°é©¬æ??"
+
+#~ msgid "Guernsey"
+#~ msgstr "æ ¼æ?©è¥¿å²?"
+
+#~ msgid "Guinea"
+#~ msgstr "å? å??äº?"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "å? å??äº?æ¯?ç»?"
+
+#~ msgid "Guyana"
+#~ msgstr "å?äº?é?£"
+
+#~ msgid "Haiti"
+#~ msgstr "æµ·å?°"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "èµ«å¾·å??éº¦å??å??çº³ç¾¤å²?"
+
+#~ msgid "Holy See"
+#~ msgstr "å?£åº§"
+
+#~ msgid "Honduras"
+#~ msgstr "æ´ªé?½æ??æ?¯"
+
+#~ msgid "Hong Kong"
+#~ msgstr "ä¸å?½é¦?æ¸¯ç?¹å?«è¡?æ?¿å?º"
+
+#~ msgid "Hungary"
+#~ msgstr "å??ç??å?©"
+
+#~ msgid "Iceland"
+#~ msgstr "å?°å²?"
+
+#~ msgid "India"
+#~ msgstr "å?°åº¦"
+
+#~ msgid "Indonesia"
+#~ msgstr "å?°åº¦å°¼è¥¿äº?"
+
+#~ msgid "Iran"
+#~ msgstr "ä¼?æ??"
+
+#~ msgid "Iraq"
+#~ msgstr "ä¼?æ??å??"
+
+#~ msgid "Ireland"
+#~ msgstr "ç?±å°?å?°"
+
+#~ msgid "Isle of Man"
+#~ msgstr "Isle of Man"
+
+#~ msgid "Israel"
+#~ msgstr "ä»¥è?²å??"
+
+#~ msgid "Italy"
+#~ msgstr "æ??å¤§å?©"
+
+#~ msgid "Jamaica"
+#~ msgstr "ç??ä¹°å? "
+
+#~ msgid "Japan"
+#~ msgstr "æ?¥æ?¬"
+
+#~ msgid "Jersey"
+#~ msgstr "æ?°å°?è¥¿"
+
+#~ msgid "Jordan"
+#~ msgstr "çº¦æ?¦"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "å??è?¨å??æ?¯å?¦"
+
+#~ msgid "Kenya"
+#~ msgstr "è?¯å°¼äº?"
+
+#~ msgid "Kiribati"
+#~ msgstr "å?ºé??å·´æ?¯"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "é?©å?½äººæ°?æ°?ä¸»å?±å??å?½"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "é?©å?½"
+
+#~ msgid "Kuwait"
+#~ msgstr "ç§?å¨?ç?¹"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "å??å°?å??æ?¯æ?¯å?¦"
+
+#~ msgid "Laos"
+#~ msgstr "è??æ??"
+
+#~ msgid "Latvia"
+#~ msgstr "æ??è?±ç»´äº?"
+
+#~ msgid "Lebanon"
+#~ msgstr "é»?å·´å«©"
+
+#~ msgid "Lesotho"
+#~ msgstr "è?±ç´¢æ??"
+
+#~ msgid "Liberia"
+#~ msgstr "å?©æ¯?é??äº?"
+
+#~ msgid "Libya"
+#~ msgstr "å?©æ¯?äº?"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "å??æ?¯æ?¦å£«ç?»"
+
+#~ msgid "Lithuania"
+#~ msgstr "ç«?é?¶å®?"
+
+#~ msgid "Luxembourg"
+#~ msgstr "å?¢æ£®å ¡"
+
+#~ msgid "Macao"
+#~ msgstr "ä¸å?½æ¾³é?¨ç?¹å?«è¡?æ?¿å?º"
+
+#~ msgid "Macedonia"
+#~ msgstr "é©¬å?¶é¡¿"
+
+#~ msgid "Madagascar"
+#~ msgstr "é©¬è¾¾å? æ?¯å? "
+
+#~ msgid "Malawi"
+#~ msgstr "é©¬æ??ç»´"
+
+#~ msgid "Malaysia"
+#~ msgstr "é©¬æ?¥è¥¿äº?"
+
+#~ msgid "Maldives"
+#~ msgstr "é©¬å°?ä»£å¤«"
+
+#~ msgid "Mali"
+#~ msgstr "é©¬é??"
+
+#~ msgid "Malta"
+#~ msgstr "é©¬è?³ä»?"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "é©¬ç»?å°?ç¾¤å²?"
+
+#~ msgid "Martinique"
+#~ msgstr "é©¬æ??å°¼å?¯å²?"
+
+#~ msgid "Mauritania"
+#~ msgstr "æ¯?é??å¡?å°¼äº?"
+
+#~ msgid "Mauritius"
+#~ msgstr "æ¯?é??æ±?æ?¯"
+
+#~ msgid "Mexico"
+#~ msgstr "å¢¨è¥¿å?¥"
+
+#~ msgid "Micronesia"
+#~ msgstr "å¯?å??ç½?å°¼è¥¿äº?"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "æ?©å°?å¤?ç?¦å?±å??å?½"
+
+#~ msgid "Monaco"
+#~ msgstr "æ?©çº³å?¥"
+
+#~ msgid "Mongolia"
+#~ msgstr "è??å?¤"
+
+#~ msgid "Montserrat"
+#~ msgstr "è??ç?¹å¡?æ??ç?¹ç¾¤å²?"
+
+#~ msgid "Morocco"
+#~ msgstr "æ?©æ´?å?¥"
+
+#~ msgid "Mozambique"
+#~ msgstr "è?«æ¡?æ¯?å??"
+
+#~ msgid "Myanmar"
+#~ msgstr "ç¼?ç?¸"
+
+#~ msgid "Namibia"
+#~ msgstr "çº³ç±³æ¯?äº?"
+
+#~ msgid "Nauru"
+#~ msgstr "ç??é²?"
+
+#~ msgid "Nepal"
+#~ msgstr "å°¼æ³?å°?"
+
+#~ msgid "Netherlands"
+#~ msgstr "è?·å?°"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "è?·å±?å®?ç??å??æ?¯"
+
+#~ msgid "New Caledonia"
+#~ msgstr "æ?°å??é??å¤?å°¼äº?"
+
+#~ msgid "New Zealand"
+#~ msgstr "æ?°è¥¿å?°"
+
+#~ msgid "Nicaragua"
+#~ msgstr "å°¼å? æ??ç??"
+
+#~ msgid "Niger"
+#~ msgstr "å°¼æ?¥å°?"
+
+#~ msgid "Nigeria"
+#~ msgstr "å°¼æ?¥å?©äº?"
+
+#~ msgid "Niue"
+#~ msgstr "çº½å??å²?"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "è¯ºç¦?å??å²?"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "å??é©¬é??äº?é?£ç¾¤å²?"
+
+#~ msgid "Norway"
+#~ msgstr "æ?ªå¨?"
+
+#~ msgid "Oman"
+#~ msgstr "é?¿æ?¼"
+
+#~ msgid "Pakistan"
+#~ msgstr "å·´å?ºæ?¯å?¦"
+
+#~ msgid "Palau"
+#~ msgstr "å¸?å?³ç¾¤å²?"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "å·´å??æ?¯å?¦å?°å?º"
+
+#~ msgid "Panama"
+#~ msgstr "å·´æ?¿é©¬"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "å·´å¸?äº?æ?°å? å??äº?"
+
+#~ msgid "Paraguay"
+#~ msgstr "å·´æ??å?"
+
+#~ msgid "Peru"
+#~ msgstr "ç§?é²?"
+
+#~ msgid "Philippines"
+#~ msgstr "è?²å?©å®¾"
+
+#~ msgid "Pitcairn"
+#~ msgstr "ç?®ç?¹å??æ?©å²?"
+
+#~ msgid "Poland"
+#~ msgstr "æ³¢å?°"
+
+#~ msgid "Portugal"
+#~ msgstr "è?¡è??ç??"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "æ³¢å¤?é»?å??"
+
+#~ msgid "Qatar"
+#~ msgstr "å?¡å¡?å°?"
+
+#~ msgid "Reunion"
+#~ msgstr "ç??å°¼æ±ª"
+
+#~ msgid "Romania"
+#~ msgstr "ç½?é©¬å°¼äº?"
+
+#~ msgid "Russian Federation"
+#~ msgstr "ä¿?ç½?æ?¯è??é?¦"
+
+#~ msgid "Rwanda"
+#~ msgstr "å?¢æ?ºè¾¾"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "å?£å?ºå¾·å??å??ç»´æ?¯"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "å?£å?¢è¥¿äº?å²?"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "å?£æ??æ£®ç?¹å??æ ¼æ??çº³è¾¾"
+
+#~ msgid "Samoa"
+#~ msgstr "è?¨æ?©äº?"
+
+#~ msgid "San Marino"
+#~ msgstr "å?£é©¬å??è¯º"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "å?£å¤?ç¾?å??æ?®æ??è¥¿æ¯?"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "æ²?ç?¹é?¿æ??ä¼¯"
+
+#~ msgid "Senegal"
+#~ msgstr "å¡?å??å? å°?"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "å¡?å°?ç»´äº?å??é»?å±±"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "å¡?æ??å?©æ??"
+
+#~ msgid "Singapore"
+#~ msgstr "æ?°å? å?¡"
+
+#~ msgid "Slovakia"
+#~ msgstr "æ?¯æ´?ä¼?å??"
+
+#~ msgid "Slovenia"
+#~ msgstr "æ?¯æ´?æ??å°¼äº?"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "æ??ç½?é?¨ç¾¤å²?"
+
+#~ msgid "Somalia"
+#~ msgstr "ç´¢é©¬é??"
+
+#~ msgid "South Africa"
+#~ msgstr "å??é??"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "å??ä¹?æ²»äº?å??å??ä¸?æ??æ²»ç¾¤å²?"
+
+#~ msgid "Spain"
+#~ msgstr "è¥¿ç?ç??"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "æ?¯é??å?°å?¡"
+
+#~ msgid "St. Helena"
+#~ msgstr "å?£èµ«å??æ?¿å²?"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "å?£ç?®å??å°?å??éº¦å??ä¼¦ç¾¤å²?"
+
+#~ msgid "Sudan"
+#~ msgstr "è??ä¸¹"
+
+#~ msgid "Suriname"
+#~ msgstr "è??é??å??"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "æ?¯ç?¦å·´å??å°?æ£?ç¾¤å²?"
+
+#~ msgid "Swaziland"
+#~ msgstr "æ?¯å¨?å£«å?°"
+
+#~ msgid "Sweden"
+#~ msgstr "ç??å?¸"
+
+#~ msgid "Switzerland"
+#~ msgstr "ç??å£«"
+
+#~ msgid "Syria"
+#~ msgstr "å??å?©äº?"
+
+#~ msgid "Taiwan"
+#~ msgstr "ä¸å?½å?°æ¹¾"
+
+#~ msgid "Tajikistan"
+#~ msgstr "å¡?å??å??æ?¯å?¦"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "å?¦æ¡?å°¼äº?è??é?¦å?±å??å?½"
+
+#~ msgid "Thailand"
+#~ msgstr "æ³°å?½"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "ä¸?å¸?æ±¶"
+
+#~ msgid "Togo"
+#~ msgstr "å¤?å?¥"
+
+#~ msgid "Tokelau"
+#~ msgstr "æ??å??å?³ç¾¤å²?"
+
+#~ msgid "Tonga"
+#~ msgstr "æ±¤å? "
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "ç?¹é??å°¼è¾¾å??å¤?å·´å?¥"
+
+#~ msgid "Tunisia"
+#~ msgstr "çª?å°¼æ?¯"
+
+#~ msgid "Turkey"
+#~ msgstr "å??è?³å?¶"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "å??åº?æ?¼æ?¯å?¦"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "ç?¹å??æ?¯å??å?¯ç§?æ?¯ç¾¤å²?"
+
+#~ msgid "Tuvalu"
+#~ msgstr "å?¾ç?¦å?¢"
+
+#~ msgid "Uganda"
+#~ msgstr "ä¹?å¹²è¾¾"
+
+#~ msgid "Ukraine"
+#~ msgstr "ä¹?å??å?°"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "é?¿æ??ä¼¯è??å??é??é?¿å?½"
+
+#~ msgid "United Kingdom"
+#~ msgstr "è?±å?½"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "ç¾?å?½å°?å??å¤?å²?"
+
+#~ msgid "Uruguay"
+#~ msgstr "ä¹?æ??å?"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "ä¹?å?¹å?«å??æ?¯å?¦"
+
+#~ msgid "Vanuatu"
+#~ msgstr "å?ªç?¦é?¿å?¾"
+
+#~ msgid "Venezuela"
+#~ msgstr "å§?å??ç??æ??"
+
+#~ msgid "Viet Nam"
+#~ msgstr "è¶?å??"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "è?±å±?å¤?å¥³ç¾¤å²?"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "ç¾?å±?å¤?å¥³ç¾¤å²?"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "ç?¦å?©æ?¯å??å¯?å?¾çº³ç¾¤å²?"
+
+#~ msgid "Western Sahara"
+#~ msgstr "è¥¿æ??å??æ??"
+
+#~ msgid "Yemen"
+#~ msgstr "ä¹?é?¨"
+
+#~ msgid "Zambia"
+#~ msgstr "èµ?æ¯?äº?"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "æ´¥å·´å¸?é?¦"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL å?³æ?¶é??è®¯ç¨?åº?"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "é??è??é??"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu-Gadu å?³æ?¶é??è®¯"
+
+#~ msgid "Service"
+#~ msgstr "æ??å?¡"
+
+#~ msgid "Username"
+#~ msgstr "ç?¨æ?·å??"
+
+#~ msgid "Address _2:"
+#~ msgstr "å?°å?? _2ï¼?"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "å??å¸?(_T)ï¼?"
+
+#~ msgid "Countr_y:"
+#~ msgstr "å?½å®¶/å?°å?º(_Y)ï¼?"
+
+#~ msgid "Full Address"
+#~ msgstr "å®?æ?´å?°å??"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "é?®æ?¿ç¼?ç ?(_Z)ï¼?"
+
+#~ msgid "Add IM Account"
+#~ msgstr "æ·»å? å?³æ?¶é??è®¯è´¦æ?·"
+
+#~ msgid "_Account name:"
+#~ msgstr "è´¦æ?·å??(_A)ï¼?"
+
+#~ msgid "_IM Service:"
+#~ msgstr "å?³æ?¶é??è®¯æ??å?¡(_I)ï¼?"
+
+#~ msgid "<b>Members</b>"
+#~ msgstr "<b>æ??å??</b>"
+
+#~ msgid "Name begins with"
+#~ msgstr "å§?å??ä»¥æ¤å¼?å¤´"
+
+#~ msgid "_Open"
+#~ msgstr "æ??å¼?(_O)"
+
+#~ msgid "_Print"
+#~ msgstr "æ??å?°(_P)"
+
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "å¤?å?¶å?°å?°å??ç°¿(_Y)..."
+
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "ç§»è?³å?°å??ç°¿(_V)..."
+
+#~ msgid "Cu_t"
+#~ msgstr "å?ªå??(_T)"
+
+#~ msgid "_Copy"
+#~ msgstr "å¤?å?¶(_C)"
+
+#~ msgid "P_aste"
+#~ msgstr "ç²?è´´(_A)"
+
+#~ msgid ""
+#~ "%s already exists\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s å·²ç»?å?å?¨\n"
+#~ "æ?¨æ??ç®?è¦?ç??å®?å??ï¼?"
+
+#~ msgid "Overwrite"
+#~ msgstr "è¦?ç??"
+
+#~ msgid "contact"
+#~ msgid_plural "contacts"
+#~ msgstr[0] "è??ç³»äºº"
+
+#~ msgid "Querying Address Book..."
+#~ msgstr "æ£å?¨æ?¥è¯¢å?°å??ç°¿..."
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "ç»?å°¾ç©ºç?½æ ¼å¼?ï¼?"
+
+#~ msgid "Body"
+#~ msgstr "é?®ä»¶ä½?"
+
+#~ msgid "Bottom:"
+#~ msgstr "åº?é?¨ï¼?"
+
+#~ msgid "Dimensions:"
+#~ msgstr "å°ºå¯¸ï¼?"
+
+#~ msgid "F_ont..."
+#~ msgstr "å?ä½?(_O)..."
+
+#~ msgid "Fonts"
+#~ msgstr "å?ä½?"
+
+#~ msgid "Footer:"
+#~ msgstr "é¡µè??ï¼?"
+
+#~ msgid "Header/Footer"
+#~ msgstr "é¡µç??/é¡µè??"
+
+#~ msgid "Headings"
+#~ msgstr "æ ?é¢?"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "æ¯?å°?ä¿¡ç??æ ?é¢?"
+
+#~ msgid "Height:"
+#~ msgstr "é«?åº¦ï¼?"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "ä¸?ä¸ªç´§æ?¥ä¸?ä¸ª"
+
+#~ msgid "Landscape"
+#~ msgstr "æ¨ªå??"
+
+#~ msgid "Left:"
+#~ msgstr "å·¦ï¼?"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "æ??è¾¹æ?¾ç¤ºå?æ¯?æ ?ç¾"
+
+#~ msgid "Margins"
+#~ msgstr "è¾¹ç??"
+
+#~ msgid "Number of columns:"
+#~ msgstr "å??æ?°ï¼?"
+
+#~ msgid "Orientation"
+#~ msgstr "æ?¹å??"
+
+#~ msgid "Page"
+#~ msgstr "é¡µé?¢"
+
+#~ msgid "Page Setup:"
+#~ msgstr "é¡µé?¢è®¾ç½®ï¼?"
+
+#~ msgid "Paper"
+#~ msgstr "çº¸å¼ "
+
+#~ msgid "Paper source:"
+#~ msgstr "çº¸å¼ æ?¥æº?ï¼?"
+
+#~ msgid "Portrait"
+#~ msgstr "çºµå??"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "ç?¨ç?°åº¦é?´å½±æ??å?°"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "å¥?æ?°é¡µå??å??"
+
+#~ msgid "Right:"
+#~ msgstr "å?³ï¼?"
+
+#~ msgid "Sections:"
+#~ msgstr "è??ï¼?"
+
+#~ msgid "Size:"
+#~ msgstr "å¤§å°?ï¼?"
+
+#~ msgid "Start on a new page"
+#~ msgstr "ä»?æ?°é¡µå¼?å§?"
+
+#~ msgid "Style name:"
+#~ msgstr "æ ·å¼?å??ï¼?"
+
+#~ msgid "Top:"
+#~ msgstr "é¡¶é?¨ï¼?"
+
+#~ msgid "Width:"
+#~ msgstr "å®½åº¦ï¼?"
+
+#~ msgid "_Font..."
+#~ msgstr "å?ä½?(_F)..."
+
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "å?¨æ¤é??ç½®æ?¨ç??æ?¶å?ºã??æ?¥å??å??ä»»å?¡å??è¡¨ "
+
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "Evolution æ?¥å??å??ä»»å?¡"
+
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "Evolution æ?¥å??é??ç½®æ?§ä»¶"
+
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "Evolution æ?¥å??è°?åº¦ä¿¡ä»¶æ?¥ç??å?¨"
+
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "Evolution æ?¥å??/ä»»å?¡æ?°é?»ç¼?è¾?å?¨"
+
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "Evolution æ?¥å??ç»?ä»¶"
+
+#~ msgid "Evolution's Memos component"
+#~ msgstr "Evolution å¤?å¿?ç»?ä»¶"
+
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "Evolution ä»»å?¡ç»?ä»¶"
+
+#~ msgid "Memo_s"
+#~ msgstr "å¤?å¿?(_S)"
+
+#~ msgid "_Calendars"
+#~ msgstr "æ?¥å??(_C)"
+
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "Evolution æ?¥å??æ??é??é??ç?¥æ??å?¡"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "æ? æ³?å??å§?å?? Bonobo"
+
+#~ msgid ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
+#~ msgstr "æ? æ³?å??å»ºæ??é??æ??å?¡è½¦é?´ï¼?å?¯è?½å·²ç»?è¿?è¡?äº?..."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+#~ msgstr "ä»»å?¡å??è¡¨å??ä»»å?¡é¢?è§?é?¢æ?¿é?´å??ç?´é?¢æ?¿ç??ä½?ç½®ï¼?ä»¥å??ç´ è®¡ã??"
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "å?¨æ?¾ç¤ºäº?ä»¶æ?¶ä½¿ç?¨æ?¯å?¦å¤?æ?¶å?¶æ?¶é?´ã??"
+
+#~ msgid "daylight savings time"
+#~ msgstr "å¤?æ?¶å?¶æ?¶é?´"
+
+#~ msgid "Category is"
+#~ msgstr "ç±»å?«ä¸º"
+
+#~ msgid "Comment contains"
+#~ msgstr "æ³¨é??å?«æ??"
+
+#~ msgid "Location contains"
+#~ msgstr "ä½?ç½®å?«æ??"
+
+#~ msgid "_Make available for offline use"
+#~ msgstr "æ ?ä¸ºå?¯è?±æ?ºä½¿ç?¨(_M)"
+
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "ä¸?æ ?ä¸ºå?¯è?±æ?ºä½¿ç?¨(_D)"
+
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "å??çº§æ?¥å??å¤±è´¥ã??"
+
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??æ?¥å??å»ºäº?ä»¶å??ä¼?è®®"
+
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr "æ²¡æ??å?¯å??å»ºäº?ä»¶å??ä¼?è®®ç??æ?¥å??"
+
+#~ msgid "New appointment"
+#~ msgstr "æ?°å»ºçº¦ä¼?"
+
+#~ msgid "New meeting"
+#~ msgstr "æ?°å»ºä¼?è®®"
+
+#~ msgid "New all day appointment"
+#~ msgstr "æ?°å»ºå?¨å¤©çº¦ä¼?"
+
+#~ msgid "New calendar"
+#~ msgstr "æ?°å»ºæ?¥å??"
+
+#~ msgid "Error while opening the calendar"
+#~ msgstr "æ??å¼?æ?¥å??æ?¶å?ºé??"
+
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "æ??å¼?æ?¥å??ç??æ?¹æ³?ä¸?æ?¯æ??"
+
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "æ²¡æ??æ??é??æ??å¼?æ?¥å??"
+
+#~ msgid "<b>Alarm</b>"
+#~ msgstr "<b>æ??é??</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>é??é¡¹</b>"
+
+#~ msgid "Attach file(s)"
+#~ msgstr "æ·»å? é??ä»¶"
+
+#~ msgid ""
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
+#~ msgstr ""
+#~ "60 å??é??\n"
+#~ "30 å??é??\n"
+#~ "15 å??é??\n"
+#~ "10 å??é??\n"
+#~ "5 å??é??"
+
+#~ msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgstr "<span weight=\"bold\">è¦å??</span>"
+
+#~ msgid "<span weight=\"bold\">General</span>"
+#~ msgstr "<span weight=\"bold\">å¸¸è§?</span>"
+
+#~ msgid "<span weight=\"bold\">Task List</span>"
+#~ msgstr "<span weight=\"bold\">ä»»å?¡å??è¡¨</span>"
+
+#~ msgid "<span weight=\"bold\">Time</span>"
+#~ msgstr "<span weight=\"bold\">æ?¶é?´</span>"
+
+#~ msgid "<span weight=\"bold\">Work Week</span>"
+#~ msgstr "<span weight=\"bold\">å·¥ä½?æ?¥</span>"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "è°?æ?´å¤?æ?¶å?¶æ?¶é?´(_V)"
+
+#~ msgid ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
+#~ msgstr ""
+#~ "å??é??\n"
+#~ "å°?æ?¶\n"
+#~ "å¤©"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
+#~ msgstr ""
+#~ "æ??æ??ä¸?\n"
+#~ "æ??æ??äº?\n"
+#~ "æ??æ??ä¸?\n"
+#~ "æ??æ??å??\n"
+#~ "æ??æ??äº?\n"
+#~ "æ??æ??å?\n"
+#~ "æ??æ??æ?¥"
+
+#~ msgid "Attached message - %s"
+#~ msgstr "é??å? ç??ä¿¡ä»¶ - %s"
+
+#~ msgid "Cancel _Drag"
+#~ msgstr "å??æ¶?æ??æ?³(_D)"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> ä¸ªé??ä»¶"
+
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "é??è??é??ä»¶æ ?(_B)"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "æ?¾ç¤ºé??ä»¶æ ?(_B)"
+
+#~ msgid "Show Attachments"
+#~ msgstr "æ?¾ç¤ºé??ä»¶"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "æ??ç©ºæ ¼é?®å?¯å??æ?¢é??ä»¶æ ?"
+
+#~ msgid "_Add "
+#~ msgstr "æ·»å? (_A)"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>ä¸?ä¼?è??(_E)</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "æ?´æ?¹ç»?ç»?è??(_H)"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "è??ç³»äºº(_N)..."
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>é¢?è§?</b>"
+
+#~ msgid "<b>Recurrence</b>"
+#~ msgstr "<b>å??ç?°</b>"
+
+#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
+#~ msgstr "<span weight=\"bold\">æ??é¡¹</span>"
+
+#~ msgid "<span weight=\"bold\">Status</span>"
+#~ msgstr "<span weight=\"bold\">ç?¶æ??</span>"
+
+#~ msgid "Save As..."
+#~ msgstr "å?¦å?ä¸º..."
+
+#~ msgid "untitled_image.%s"
+#~ msgstr "æ? æ ?é¢?å?¾å??.%s"
+
+#~ msgid "_Save As..."
+#~ msgstr "å?¦å?ä¸º(_S)..."
+
+#~ msgid "_Save Selected"
+#~ msgstr "ä¿?å?é??ä¸(_S)"
+
+#~ msgid "P_rint..."
+#~ msgstr "æ??å?°(_R)..."
+
+#~ msgid "C_ut"
+#~ msgstr "å?ªå??(_U)"
+
+#~ msgid "_Paste"
+#~ msgstr "ç²?è´´(_P)"
+
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "æ??ä»»å?¡æ ?è®°ä¸ºå®?æ??(_M)"
+
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "æ??ä»»å?¡æ ?è®°ä¸ºæ?ªå®?æ??(_M)"
+
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "å? é?¤é??ä¸ä»»å?¡(_D)"
+
+#~ msgid "Select T_oday"
+#~ msgstr "é??æ?©ä»?å¤©(_O)"
+
+#~ msgid "_Select Date..."
+#~ msgstr "é??æ?©æ?¥æ??(_S)..."
+
+#~ msgid "Pri_nt..."
+#~ msgstr "æ??å?°(_N)..."
+
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "å? é?¤é??ä¸å¤?å¿?(_D)"
+
+#~ msgid "Completing tasks..."
+#~ msgstr "æ£å?¨å®?æ??ä»»å?¡..."
+
+#~ msgid "_Custom View"
+#~ msgstr "è?ªå®?ä¹?è§?å?¾(_C)"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "ä¿?å?è?ªå®?ä¹?è§?å?¾(_S)"
+
+#~ msgid "_Define Views..."
+#~ msgstr "å®?ä¹?è§?å?¾(_D)..."
+
+#~ msgid "Loading tasks at %s"
+#~ msgstr "è£?å?¥ä½?äº? %s ç??ä»»å?¡"
+
+#~ msgid "Loading memos at %s"
+#~ msgstr "è£?å?¥ä½?äº? %s ç??å¤?å¿?"
+
+#~ msgid "Failed upgrading memos."
+#~ msgstr "å??çº§å¤?å¿?å¤±è´¥ã??"
+
+#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
+#~ msgstr "æ? æ³?æ??å¼?å¤?å¿?å??è¡¨â??%sâ??æ?¥å??å»ºäº?ä»¶å??ä¼?è®®"
+
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "æ²¡æ??å?¯å??å»ºå¤?å¿?ç??æ?¥å??"
+
+#~ msgid "New shared memo"
+#~ msgstr "æ?°å»ºå?±äº«å¤?å¿?"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "å¤?å¿?å??è¡¨(_S)"
+
+#~ msgid "Failed upgrading tasks."
+#~ msgstr "å??çº§ä»»å?¡å¤±è´¥ã??"
+
+#~ msgid "Unable to open the task list '%s' for creating events and meetings"
+#~ msgstr "æ? æ³?æ??å¼?ä»»å?¡å??è¡¨â??%sâ??æ?¥å??å»ºäº?ä»¶å??ä¼?è®®"
+
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "æ²¡æ??å?¯å??å»ºä»»å?¡ç??æ?¥å??"
+
+#~ msgid "New task"
+#~ msgstr "æ?°å»ºä»»å?¡"
+
+#~ msgid "New assigned task"
+#~ msgstr "æ?°å»ºå??é??ç??ä»»å?¡"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "ä»»å?¡å??è¡¨(_K)"
+
+#~ msgid "Could not open autosave file"
+#~ msgstr "æ? æ³?æ??å¼?è?ªå?¨ä¿?å?æ??ä»¶"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "æ??é??å?°å??(_P)"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "æ?¯å?¦æ?¾ç¤ºæ??é??å?°å??"
+
+#~ msgid "_Subject Field"
+#~ msgstr "ä¸»é¢?å??(_C)"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºä¸»é¢?å??"
+
+#~ msgid "_To Field"
+#~ msgstr "æ?¶ä»¶äººå??(_T)"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "æ?¯å?¦æ?¾ç¤ºå¯?ç»?å??"
+
+#~ msgid ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+#~ msgstr "å??é??é??é¡¹å?ªé??ç?¨äº? Novell GroupWise å?? Microsoft Exchange è´¦æ?·ã??"
+
+#~ msgid "Send options not available."
+#~ msgstr "å??é??é??é¡¹ä¸?å?¯ç?¨ã??"
+
+#~ msgid "Evolution Information"
+#~ msgstr "Evolution ä¿¡æ?¯"
+
+#~ msgid "Evolution Query"
+#~ msgstr "Evolution æ?¥è¯¢"
+
+#~ msgid "Component"
+#~ msgstr "ç»?ä»¶"
+
+#~ msgid "Label name cannot be empty."
+#~ msgstr "æ ?ç¾å??ç§°ä¸?è?½ä¸ºç©ºã??"
+
+#~ msgid ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+#~ msgstr "æ??å?¡å?¨ä¸?å·²å?å?¨å??å??ç??æ ?ç¾ã??è¯·é??å?½å??æ?¨ç??æ ?ç¾ã??"
+
+#~ msgid "Test"
+#~ msgstr "æµ?è¯?"
+
+#~ msgid "<b>_Filter Rules</b>"
+#~ msgstr "<b>è¿?æ»¤è§?å??(_F)</b>"
+
+#~ msgid "Rule name"
+#~ msgstr "è§?å??å??"
+
+#~ msgid ""
+#~ "Configure mail preferences, including security and message display, here"
+#~ msgstr "å?¨æ¤é??ç½®é?®ä»¶é¦?é??é¡¹ï¼?å??æ?¬å®?å?¨å??ä¿¡ä»¶æ?¾ç¤º"
+
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
+#~ msgstr "å?¨æ¤é??ç½®æ?¼å??æ£?æ?¥ã??ç¾å??å??ä¿¡ä»¶ç¼?å??å?¨"
+
+#~ msgid "Configure your email accounts here"
+#~ msgstr "å?¨è¿?é??é??ç½®æ?¨ç??ç?µå?é?®ä»¶è´¦æ?·"
+
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "å?¨è¿?é??é??ç½®æ?¨ç??ç½?ç»?è¿?æ?¥è®¾ç½®"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "Evolution é?®ä»¶"
+
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "Evolution é?®ä»¶è´¦æ?·é??ç½®æ?§å?¶"
+
+#~ msgid "Evolution Mail component"
+#~ msgstr "Evolution é?®ä»¶ç»?ä»¶"
+
+#~ msgid "Evolution Mail composer"
+#~ msgstr "Evolution é?®ä»¶æ?°å??å?¨"
+
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "Evolution é?®ä»¶æ?°å??æ?§ä»¶"
+
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "Evolution é?®ä»¶é¦?é??é¡¹æ?§ä»¶"
+
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "Evolution ç½?ç»?é??ç½®æ?§ä»¶"
+
+#~ msgid "[Default]"
+#~ msgstr "[é»?è®¤]"
+
+#~ msgid "Signature(s)"
+#~ msgstr "ç¾å??"
+
+#~ msgid "Account Search"
+#~ msgstr "è´¦æ?·æ??ç´¢"
+
+#~ msgid "All Account Search"
+#~ msgstr "å?¨é?¨è´¦æ?·æ??ç´¢"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "å¤?å?¶å?°æ??ä»¶å¤¹(_C)"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "ç§»è?³æ??ä»¶å¤¹(_M)"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?(_N)"
+
+#~ msgid "_Move..."
+#~ msgstr "ç§»å?¨(_M)..."
+
+#~ msgid "_Unread Search Folder"
+#~ msgstr "æ?ªè¯»æ??ç´¢æ??ä»¶å¤¹(_U)"
+
+#~ msgid "U_ndelete"
+#~ msgstr "å??æ¶?å? é?¤(_N)"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "å·²å®?æ??æ ?å¿?(_G)"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "æ¸?é?¤æ ?å¿?(_E)"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "æ ¹æ?®ä¿¡ä»¶å??å»ºè§?å??(_T)"
+
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "å?ºäº?ä¸»é¢?ç??æ??ç´¢æ??ä»¶å¤¹(_S)"
+
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "å?ºäº?å??ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_N)"
+
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "å?ºäº?æ?¶ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_R)"
+
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "å?ºäº?ä¸»é¢?è¿?æ»¤(_J)"
+
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "å?ºäº?å??ä»¶äººè¿?æ»¤(_D)"
+
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "å?ºäº?æ?¶ä»¶äººè¿?æ»¤(_C)"
+
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "å?ºäº?é?®ä»¶å??è¡¨è¿?æ»¤(_M)"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "æ£å?¨æ?¶å??ä¿¡ä»¶..."
+
+#~ msgid "C_all To..."
+#~ msgstr "å?¼å?«å?°(_A)..."
+
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "%Yå¹´%mæ??%dæ?¥%Aï¼?%p%l:%Må®?æ??"
+
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "å?° %mæ??%dæ?¥%Aï¼?%p%l:%M"
+
+#~ msgid "_Fit to Width"
+#~ msgstr "é??å??å®½åº¦(_F)"
+
+#~ msgid "_Save Selected..."
+#~ msgstr "ä¿?å?æ??é??(_S)..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d ä¸ªé??ä»¶(_T)"
+
+#~ msgid "S_ave"
+#~ msgstr "ä¿?å?(_A)"
+
+#~ msgid "No Attachment"
+#~ msgstr "æ? é??ä»¶"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%Aï¼?%R %Z)"
+
+#~ msgid " (%R %Z)"
+#~ msgstr " (%R %Z)"
+
+#~ msgid "Tag"
+#~ msgstr "æ ?ç¾"
+
+#~ msgid "_Reply to sender"
+#~ msgstr "å??å¤?å??ä»¶äºº(_R)"
+
+#~ msgid "message"
+#~ msgstr "ä¿¡ä»¶"
+
+#~ msgid "Add address"
+#~ msgstr "æ·»å? å?°å??"
+
+#~ msgid "Default height of the message window."
+#~ msgstr "ä¿¡ä»¶çª?å?£ç??é»?è®¤é«?åº¦ã??"
+
+#~ msgid "Default width of the message window."
+#~ msgstr "ä¿¡ä»¶çª?å?£ç??é»?è®¤å®½åº¦ã??"
+
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "å?¯ç?¨ä¾§è¾¹æ ?æ??ç´¢ç?¹æ?§ï¼?ä»¥ä¾¿å?¯ä»¥å?¨è¾?å?¥æ??æ?¬ç??å??æ?¶è¿?è¡?äº¤äº?å¼?æ??ç´¢ã??è¿?ä¹?å??ç??ä½?ç?¨å?¨"
+#~ "äº?æ?¨å?¯ä»¥æ?´å? è½»æ?¾å?°å?¨ä¾§è¾¹æ ?ä¸æ?¾å?°æ??ä»¶å¤¹ï¼?å?ªé??è¾?å?¥æ??ä»¶å¤¹å??ç§°ï¼?ç?¶å??é??ä¸è??å?´å°±"
+#~ "ä¼?è?ªå?¨è·³è½¬å?°è¯¥æ??ä»¶å¤¹ã??"
+
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr "å¦?æ??å¼?å?¯äº?â??é¢?è§?â??é?¢æ?¿ï¼?å??ä»¥å¹¶å??æ?¹å¼?æ?¾ç¤ºï¼?è??ä¸?æ?¯å??ç?´æ?¹å¼?æ?¾ç¤ºã??"
+
+#~ msgid ""
+#~ "It disables/enables the repeated prompts to ask if offline sync is "
+#~ "required before going into offline mode."
+#~ msgstr "ç¦?ç?¨/å?¯ç?¨å?¨è¿?å?¥ç¦»çº¿æ¨¡å¼?å??ç??æ?¯å?¦é??è¦?ç¦»çº¿å??æ¥ç??ä¸?å??ç??æ??ç¤ºã??"
+
+#~ msgid "Message Window default height"
+#~ msgstr "ä¿¡ä»¶çª?å?£é»?è®¤é«?åº¦"
+
+#~ msgid "Message Window default width"
+#~ msgstr "ä¿¡ä»¶çª?å?£é»?è®¤å®½åº¦"
+
+#~ msgid "Prompt to check if the user wants to go offline immediately"
+#~ msgstr "ç?¨æ?·æ?³ç«?å?³ç¦»çº¿æ?¶æ??ç¤ºæ£?æ?¥"
+
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "ä½¿ç?¨å¹¶æ??è¿?æ?¯å®½å±?å¸?å±?"
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "é??ä¸äº?æ?¥ç??/Bcc è??å??é¡¹"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "é??ä¸äº?æ?¥ç??/Bcc è??å??é¡¹ã??"
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "é??ä¸äº?æ?¥ç??/Cc è??å??é¡¹"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "é??ä¸äº?æ?¥ç??/Cc è??å??é¡¹ã??"
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "é??ä¸äº?æ?¥ç??/From è??å??é¡¹"
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "é??ä¸äº?æ?¥ç??/From è??å??é¡¹ã??"
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "é??ä¸äº?æ?¥ç??/PostTo è??å??é¡¹"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "é??ä¸äº?æ?¥ç??/PostTo è??å??é¡¹ã??"
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "é??ä¸äº?æ?¥ç??/ReplyTo è??å??é¡¹"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "é??ä¸äº?æ?¥ç??/ReplyTo è??å??é¡¹ã??"
+
+#~ msgid "New Mail Message"
+#~ msgstr "æ?°å»ºä¿¡ä»¶"
+
+#~ msgid "New Mail Folder"
+#~ msgstr "æ?°å»ºé?®ä»¶æ??ä»¶å¤¹"
+
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "å??çº§é?®ä»¶è®¾ç½®æ??æ??ä»¶å¤¹å¤±è´¥ã??"
+
+#~ msgid " Ch_eck for Supported Types "
+#~ msgstr "æ£?æ?¥æ?¯æ??ç??ç±»å??(_E)"
+
+#~ msgid "<b>Sig_natures</b>"
+#~ msgstr "<b>ç¾å??(_N)</b>"
+
+#~ msgid "<b>_Languages</b>"
+#~ msgstr "<b>è¯è¨?(_L)</b>"
+
+#~ msgid "<span weight=\"bold\">Account Information</span>"
+#~ msgstr "<span weight=\"bold\">è´¦æ?·ä¿¡æ?¯</span>"
+
+#~ msgid "<span weight=\"bold\">Authentication</span>"
+#~ msgstr "<span weight=\"bold\">èº«ä»½éª?è¯?</span>"
+
+#~ msgid "<span weight=\"bold\">Composing Messages</span>"
+#~ msgstr "<span weight=\"bold\">æ?°å??ä¿¡ä»¶</span>"
+
+#~ msgid "<span weight=\"bold\">Configuration</span>"
+#~ msgstr "<span weight=\"bold\">é??ç½®</span>"
+
+#~ msgid "<span weight=\"bold\">Default Behavior</span>"
+#~ msgstr "<span weight=\"bold\">é»?è®¤è¡?ä¸º</span>"
+
+#~ msgid "<span weight=\"bold\">Delete Mail</span>"
+#~ msgstr "<span weight=\"bold\">å? é?¤é?®ä»¶</span>"
+
+#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+#~ msgstr "<span weight=\"bold\">æ?¾ç¤ºç??é?®ä»¶å¤´(_H)</span>"
+
+#~ msgid "<span weight=\"bold\">Labels</span>"
+#~ msgstr "<span weight=\"bold\">æ ?ç¾</span>"
+
+#~ msgid "<span weight=\"bold\">Loading Images</span>"
+#~ msgstr "<span weight=\"bold\">è£?å?¥å?¾å??</span>"
+
+#~ msgid "<span weight=\"bold\">Message Display</span>"
+#~ msgstr "<span weight=\"bold\">ä¿¡ä»¶æ?¾ç¤º</span>"
+
+#~ msgid "<span weight=\"bold\">Message Fonts</span>"
+#~ msgstr "<span weight=\"bold\">ä¿¡ä»¶å?ä½?</span>"
+
+#~ msgid "<span weight=\"bold\">Message Receipts</span>"
+#~ msgstr "<span weight=\"bold\">ä¿¡ä»¶æ?¶æ?¡</span>"
+
+#~ msgid "<span weight=\"bold\">Optional Information</span>"
+#~ msgstr "<span weight=\"bold\">å?¯é??ä¿¡æ?¯</span>"
+
+#~ msgid "<span weight=\"bold\">Options</span>"
+#~ msgstr "<span weight=\"bold\">é??é¡¹</span>"
+
+#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
+#~ msgstr "<span weight=\"bold\">æ??å?°å?ä½?</span>"
+
+#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
+#~ msgstr "<span weight=\"bold\">ä»£ç??æ??å?¡å?¨ç?¶æ??</span>"
+
+#~ msgid "<span weight=\"bold\">Required Information</span>"
+#~ msgstr "<span weight=\"bold\">è¯·æ±?ç??ä¿¡æ?¯</span>"
+
+#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+#~ msgstr "<span weight=\"bold\">å®?å?¨ MIME(S/MIME)</span>"
+
+#~ msgid "<span weight=\"bold\">Security</span>"
+#~ msgstr "<span weight=\"bold\">å®?å?¨</span>"
+
+#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+#~ msgstr "<span weight=\"bold\">å·²å??é??å??è??ç¨¿ä¿¡ä»¶</span>"
+
+#~ msgid "<span weight=\"bold\">Server Configuration</span>"
+#~ msgstr "<span weight=\"bold\">æ??å?¡å?¨é??ç½®</span>"
+
+#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
+#~ msgstr "<span weight=\"bold\">è®¤è¯?ç±»å??(_A)</span>"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "æ³¢ç½?ç??è¯(ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "æ³¢ç½?ç??è¯(ISO-8859-4)"
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "æ£?æ?¥æ?¯æ??ç??ç±»å??(_E)"
+
+#~ msgid "Email Accounts"
+#~ msgstr "ç?µå?é?®ä»¶"
+
+#~ msgid "Message Composer"
+#~ msgstr "ä¿¡ä»¶æ?°å??å?¨"
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "SOCKS ä¸»æ?º(_O)ï¼?"
+
+#~ msgid "Signatures Table"
+#~ msgstr "ç¾å??è¡¨"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "è?ªå?¨ä»£ç??æ??å?¡å?¨é??ç½® URL(_A)ï¼?"
+
+#~ msgid "<b>Search Folder Sources</b>"
+#~ msgstr "<b>æ??ç´¢æ??ä»¶å¤¹æ?¥æº?</b>"
+
+#~ msgid "<span weight=\"bold\">Digital Signature</span>"
+#~ msgstr "<span weight=\"bold\">æ?°å?ç¾å??</span>"
+
+#~ msgid "<span weight=\"bold\">Encryption</span>"
+#~ msgstr "<span weight=\"bold\">å? å¯?</span>"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "å?ºå??å¤§å°?å??(_S)"
+
+#~ msgid "F_ind:"
+#~ msgstr "æ?¥æ?¾(_I)ï¼?"
+
+#~ msgid "Find in Message"
+#~ msgstr "å?¨ä¿¡ä»¶ä¸æ?¥æ?¾"
+
+#~ msgid "None Selected"
+#~ msgstr "æ²¡æ??é??ä¸"
+
+#~ msgid "Delete \"{0}\"?"
+#~ msgstr "å? é?¤â??{0}â??å??ï¼?"
+
+#~ msgid "Delete account?"
+#~ msgstr "å? é?¤è´¦æ?·å??ï¼?"
+
+#~ msgid "Delete messages in Search Folder?"
+#~ msgstr "å? é?¤æ??ç´¢æ??ä»¶å¤¹ä¸ç??ä¿¡ä»¶å??ï¼?"
+
+#~ msgid "Discard changes?"
+#~ msgstr "ä¸¢å¼?æ?´æ?¹å??ï¼?"
+
+#~ msgid "Mark all messages as read"
+#~ msgstr "æ??æ??æ??ä¿¡ä»¶æ ?è®°ä¸ºå·²è¯»"
+
+#~ msgid "Querying server"
+#~ msgstr "æ?¥è¯¢æ??å?¡å?¨"
+
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "ä¸»é¢?æ??æ?¥æ?¶è??å?«æ??"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "æ??ä¾?æ?¬å?°å?°å??ç°¿ç??æ ¸å¿?å??è?½ã??"
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr "å?¨ä¿¡ä»¶ä¸æ??ç´¢æ??å??é??ä»¶ç??çº¿ç´¢å¹¶å?¨æ? é??ä»¶æ?¶è¦å??"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]